You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2019/02/05 21:08:41 UTC
svn commit: r1853036 - in /uima/uv3/uimaj-v3/trunk:
jVinci/src/main/java/org/apache/vinci/transport/document/
jVinci/src/main/java/org/apache/vinci/transport/util/
jVinci/src/main/java/org/apache/vinci/transport/vns/service/
uimaj-adapter-soap/src/main...
Author: schor
Date: Tue Feb 5 21:08:41 2019
New Revision: 1853036
URL: http://svn.apache.org/viewvc?rev=1853036&view=rev
Log:
[UIMA-5931] try-with-resources
Modified:
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java
uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java
uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java Tue Feb 5 21:08:41 2019
@@ -253,16 +253,12 @@ public class XMLToXTalk {
xml_os.close();
}
}
- RandomAccessFile raf = new RandomAccessFile(filename, "rw");
- try {
+ try (RandomAccessFile raf = new RandomAccessFile(filename, "rw")) {
raf.skipBytes(7);
// int return_val =
updateElement(raf, handler.countList, 0);
// Debug.p("Return val: " + return_val);
- } finally {
- raf.close();
}
-
}
static private int updateElement(RandomAccessFile raf, ArrayList counts, int index)
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java Tue Feb 5 21:08:41 2019
@@ -70,17 +70,10 @@ public class TransportableConverter {
static public void convert(Transportable convert_me, Transportable into_me) {
try {
ByteArrayOutputStream byte_out = new ByteArrayOutputStream();
- try {
- convert_me.toStream(byte_out);
- } finally {
- byte_out.close();
- }
- ByteArrayInputStream byte_in = new ByteArrayInputStream(byte_out.toByteArray());
- try {
- byte_out = null; // allow GC
+ convert_me.toStream(byte_out);
+
+ try (ByteArrayInputStream byte_in = new ByteArrayInputStream(byte_out.toByteArray())) {
into_me.fromStream(byte_in);
- } finally {
- byte_in.close();
}
} catch (IOException e) {
throw new FatalException(e); // this should not arise.
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java Tue Feb 5 21:08:41 2019
@@ -417,13 +417,9 @@ public class ServiceRegistry {
DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-
- FileReader readme = new FileReader(fname);
Document doc;
- try {
+ try (FileReader readme = new FileReader(fname)) {
doc = docBuilder.parse(new InputSource(readme));
- } finally {
- readme.close();
}
Element root = doc.getDocumentElement();
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java Tue Feb 5 21:08:41 2019
@@ -348,21 +348,12 @@ public class VNS extends VinciServableAd
public void loadWorkspaces(String wFile) {
Debug.p("Loading workspaces file : " + wFile);
- FileReader F = null;
- try {
- F = new FileReader(wFile);
+ try (FileReader F = new FileReader(wFile)) {
WS.load(F);
- F.close();
} catch (Exception e) {
Debug.reportException(e);
Debug.p("WARNING: failed to load workspace.");
- } finally {
- try {
- F.close();
- } catch (Exception e) {
- }
}
-
}
public void loadCounters(String cFile) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java Tue Feb 5 21:08:41 2019
@@ -99,11 +99,8 @@ public class BinaryDeserializer extends
.getActivationDataHandler((org.apache.axis.Part) ref);
Object content = dataHandler.getContent();
// System.out.println(content.getClass().getName());
- ObjectInputStream objStream = new ObjectInputStream((InputStream) content);
- try {
+ try (ObjectInputStream objStream = new ObjectInputStream((InputStream) content)) {
setValue(objStream.readObject());
- } finally {
- objStream.close();
}
} catch (org.apache.axis.AxisFault e) {
throw new SAXException(e.getMessage());
Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java?rev=1853036&r1=1853035&r2=1853036&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java Tue Feb 5 21:08:41 2019
@@ -98,11 +98,8 @@ public class BinaryDeserializer_Axis11 e
.getActivationDataHandler((org.apache.axis.Part) ref);
Object content = dataHandler.getContent();
// System.out.println(content.getClass().getName());
- ObjectInputStream objStream = new ObjectInputStream((InputStream) content);
- try {
+ try (ObjectInputStream objStream = new ObjectInputStream((InputStream) content)) {
setValue(objStream.readObject());
- } finally {
- objStream.close();
}
} catch (org.apache.axis.AxisFault e) {
throw new SAXException(e.getMessage());