Author: felixk
Date: Tue Mar 22 07:08:17 2011
New Revision: 1084083
URL: http://svn.apache.org/viewvc?rev=1084083&view=rev
Log:
Make sure, the stream gets closed (see JAMES-1207)
Modified:
james/server/trunk/pom.xml
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/queue-activemq/pom.xml
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1084083&r1=1084082&r2=1084083&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Mar 22 07:08:17 2011
@@ -1255,7 +1255,7 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</exclusion>
- <!-- eclude this, we don't use osgi yet -->
+ <!-- exclude this, we don't use osgi yet -->
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -1293,6 +1293,13 @@
<version>2.2.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>compile</scope>
+ <version>1.3.9</version>
+ </dependency>
+
<!-- OSGI dependencies -->
<dependency>
<groupId>org.springframework.osgi</groupId>
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1084083&r1=1084082&r2=1084083&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Tue Mar 22 07:08:17 2011
@@ -397,18 +397,24 @@ public abstract class AbstractConfigurab
private void buildSSLContext() throws Exception {
if (useStartTLS || useSSL) {
- KeyStore ks = KeyStore.getInstance("JKS");
- ks.load(new FileInputStream(fileSystem.getFile(keystore)),
secret.toCharArray());
-
- // Set up key manager factory to use our key store
- KeyManagerFactory kmf =
KeyManagerFactory.getInstance(x509Algorithm);
- kmf.init(ks, secret.toCharArray());
-
- // Initialize the SSLContext to work with our key managers.
- context = SSLContext.getInstance("TLS");
- context.init(kmf.getKeyManagers(), null, null);
-
-
+ FileInputStream fis = null;
+ try {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ fis = new FileInputStream(fileSystem.getFile(keystore));
+ ks.load(fis, secret.toCharArray());
+
+ // Set up key manager factory to use our key store
+ KeyManagerFactory kmf =
KeyManagerFactory.getInstance(x509Algorithm);
+ kmf.init(ks, secret.toCharArray());
+
+ // Initialize the SSLContext to work with our key managers.
+ context = SSLContext.getInstance("TLS");
+ context.init(kmf.getKeyManagers(), null, null);
+ } finally {
+ if (fis != null) {
+ fis.close();
+ }
+ }
}
}
Modified: james/server/trunk/queue-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1084083&r1=1084082&r2=1084083&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Tue Mar 22 07:08:17 2011
@@ -95,6 +95,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!-- testing -->
<dependency>
Modified:
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java?rev=1084083&r1=1084082&r2=1084083&view=diff
==============================================================================
---
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
(original)
+++
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
Tue Mar 22 07:08:17 2011
@@ -59,6 +59,7 @@ public class FileSystemBlobStrategy impl
* (non-Javadoc)
* @see
org.apache.activemq.blob.BlobUploadStrategy#uploadFile(org.apache.activemq.command.ActiveMQBlobMessage,
java.io.File)
*/
+
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="OBL_UNSATISFIED_OBLIGATION",
justification="Closed in uploadStream")
public URL uploadFile(ActiveMQBlobMessage message, File file) throws
JMSException, IOException {
return uploadStream(message, new FileInputStream(file));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
