| Chunk |
|---|
| Conflicting content |
|---|
sers.put(UUID.class, new UUIDSerializer());
sers.put(java.util.regex.Pattern.class, sls);
sers.put(Locale.class, sls);
<<<<<<< HEAD
// then atomic types (note: AtomicReference defined elsewhere)
=======
// then atomic types (note: AtomicReference needs better handling)
>>>>>>> 2d90441ef0440f3a2f910b210234cb8b709ca727
sers.put(AtomicBoolean.class, AtomicBooleanSerializer.class);
sers.put(AtomicInteger.class, AtomicIntegerSerializer.class);
sers.put(AtomicLong.class, AtomicLongSerializer.class); |
| Solution content |
|---|
sers.put(UUID.class, new UUIDSerializer());
sers.put(java.util.regex.Pattern.class, sls);
sers.put(Locale.class, sls);
// then atomic types (note: AtomicReference defined elsewhere)
sers.put(AtomicBoolean.class, AtomicBooleanSerializer.class);
sers.put(AtomicInteger.class, AtomicIntegerSerializer.class);
sers.put(AtomicLong.class, AtomicLongSerializer.class); |
| File |
|---|
| StdJdkSerializers.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |