You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/04/12 03:05:56 UTC

svn commit: r1325086 - in /camel/branches/camel-2.9.x/components: camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java

Author: hadrian
Date: Thu Apr 12 01:05:56 2012
New Revision: 1325086

URL: http://svn.apache.org/viewvc?rev=1325086&view=rev
Log:
Fix build after backmerging to use proper api

Modified:
    camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
    camel/branches/camel-2.9.x/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java

Modified: camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java?rev=1325086&r1=1325085&r2=1325086&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java (original)
+++ camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java Thu Apr 12 01:05:56 2012
@@ -230,7 +230,8 @@ public class ScpOperations implements Re
         try {
             writeFile(name, data, os, is, cfg);
         } finally {
-            IOHelper.close(is, os);
+            IOHelper.close(is);
+            IOHelper.close(os);
         }
     }
 

Modified: camel/branches/camel-2.9.x/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java?rev=1325086&r1=1325085&r2=1325086&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java (original)
+++ camel/branches/camel-2.9.x/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java Thu Apr 12 01:05:56 2012
@@ -171,7 +171,8 @@ public class ShiroSecurityPolicy impleme
                 try {
                     securityToken = (ShiroSecurityToken)objectInputStream.readObject();
                 } finally {
-                    IOHelper.close(objectInputStream, byteArrayInputStream);
+                    IOHelper.close(objectInputStream);
+                    IOHelper.close(byteArrayInputStream);
                 }
 
                 Subject currentUser = SecurityUtils.getSubject();