You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/05/11 07:31:06 UTC

svn commit: r1678675 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Author: kfujino
Date: Mon May 11 05:31:06 2015
New Revision: 1678675

URL: http://svn.apache.org/r1678675
Log:
use try-with-resources.

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1678675&r1=1678674&r2=1678675&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Mon May 11 05:31:06 2015
@@ -159,8 +159,7 @@ public class DeltaSession extends Standa
     @Override
     public void applyDiff(byte[] diff, int offset, int length) throws IOException, ClassNotFoundException {
         lock();
-        try {
-            ReplicationStream stream = ( (ClusterManager) getManager()).getReplicationStream(diff, offset, length);
+        try (ObjectInputStream stream = ((ClusterManager) getManager()).getReplicationStream(diff, offset, length)) {
             ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
             try {
                 ClassLoader[] loaders = getClassLoaders();
@@ -168,7 +167,6 @@ public class DeltaSession extends Standa
                     Thread.currentThread().setContextClassLoader(loaders[0]);
                 getDeltaRequest().readExternal(stream);
                 getDeltaRequest().execute(this, ((ClusterManager)getManager()).isNotifyListenersOnReplication());
-                stream.close();
             } finally {
                 Thread.currentThread().setContextClassLoader(contextLoader);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org