Fix #2234 (manual merge to 2.10)

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java

@@ -376,15 +376,17 @@ public void testDataOutputViaMapper() throws Exception
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         ObjectNode input = MAPPER.createObjectNode();
         input.put("a", 1);
-        DataOutput data = new DataOutputStream(bytes);
         final String exp = "{\"a\":1}";
-        MAPPER.writeValue(data, input);
+        try (DataOutputStream data = new DataOutputStream(bytes)) {
+            MAPPER.writeValue((DataOutput) data, input);
+        }
         assertEquals(exp, bytes.toString("UTF-8"));
 
         // and also via ObjectWriter...
         bytes.reset();
-        data = new DataOutputStream(bytes);
-        MAPPER.writer().writeValue(data, input);
+        try (DataOutputStream data = new DataOutputStream(bytes)) {
+            MAPPER.writer().writeValue((DataOutput) data, input);
+        }
         assertEquals(exp, bytes.toString("UTF-8"));
     }
 

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypesTest.java

@@ -359,34 +359,34 @@ public void testUUIDInvalid() throws Exception
 
     public void testUUIDAux() throws Exception
     {
-        // [JACKSON-393] fix:
         final UUID value = UUID.fromString("76e6d183-5f68-4afa-b94a-922c1fdb83f8");
 
         // first, null should come as null
-        TokenBuffer buf = new TokenBuffer(null, false);
-        buf.writeObject(null);
-        assertNull(MAPPER.readValue(buf.asParser(), UUID.class));
-        buf.close();
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeObject(null);
+            assertNull(MAPPER.readValue(buf.asParser(), UUID.class));
+        }
 
         // then, UUID itself come as is:
-        buf = new TokenBuffer(null, false);
-        buf.writeObject(value);
-        assertSame(value, MAPPER.readValue(buf.asParser(), UUID.class));
-
-        // and finally from byte[]
-        // oh crap; JDK UUID just... sucks. Not even byte[] accessors or constructors? Huh?
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        DataOutputStream out = new DataOutputStream(bytes);
-        out.writeLong(value.getMostSignificantBits());
-        out.writeLong(value.getLeastSignificantBits());
-        byte[] data = bytes.toByteArray();
-        assertEquals(16, data.length);
-        
-        buf.writeObject(data);
-
-        UUID value2 = MAPPER.readValue(buf.asParser(), UUID.class);
-        
-        assertEquals(value, value2);
-        buf.close();
+        try (TokenBuffer buf = new TokenBuffer(null, false)) {
+            buf.writeObject(value);
+            assertSame(value, MAPPER.readValue(buf.asParser(), UUID.class));
+    
+            // and finally from byte[]
+            // oh crap; JDK UUID just... sucks. Not even byte[] accessors or constructors? Huh?
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            DataOutputStream out = new DataOutputStream(bytes);
+            out.writeLong(value.getMostSignificantBits());
+            out.writeLong(value.getLeastSignificantBits());
+            out.close();
+            byte[] data = bytes.toByteArray();
+            assertEquals(16, data.length);
+            
+            buf.writeObject(data);
+    
+            UUID value2 = MAPPER.readValue(buf.asParser(), UUID.class);
+            
+            assertEquals(value, value2);
+        }
     }
 }