Author: aduprat
Date: Mon Jan 18 10:53:34 2016
New Revision: 1725221
URL: http://svn.apache.org/viewvc?rev=1725221&view=rev
Log:
JAMES-1653 Code is not java-6 compliant - contributed by Raphael Rouazana.
Contributed by Tellier <[email protected]>
Modified:
james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
james/project/trunk/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
Modified:
james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java?rev=1725221&r1=1725220&r2=1725221&view=diff
==============================================================================
---
james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
(original)
+++
james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
Mon Jan 18 10:53:34 2016
@@ -138,9 +138,9 @@ public class SpamAssassinInvoker {
try {
Closeables.close(in, true);
Closeables.close(out, true);
- Closeables.close(socket, true);
+ socket.close();
} catch (Exception e) {
- // Should never happin
+ // Should never happen
}
}
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java?rev=1725221&r1=1725220&r2=1725221&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
Mon Jan 18 10:53:34 2016
@@ -29,7 +29,6 @@ import java.util.Scanner;
import javax.inject.Inject;
import javax.mail.MessagingException;
-import org.apache.commons.io.IOUtils;
import org.apache.james.managesieve.api.Session;
import org.apache.james.managesieve.api.SieveParser;
import org.apache.james.managesieve.core.CoreProcessor;
@@ -199,8 +198,9 @@ public class ManageSieveMailet extends G
throw new MessagingException("Unable to access help URL: " +
helpURL.toExternalForm(), ex);
}
finally {
- IOUtils.closeQuietly(scanner);
- IOUtils.closeQuietly(stream);
+ if (scanner != null) {
+ scanner.close();
+ }
}
}
Modified:
james/project/trunk/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java?rev=1725221&r1=1725220&r2=1725221&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
(original)
+++
james/project/trunk/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
Mon Jan 18 10:53:34 2016
@@ -19,13 +19,14 @@
package org.apache.james.managesieveserver.netty;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.handler.stream.ChunkedStream;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.handler.stream.ChunkedStream;
+
+import com.google.common.base.Charsets;
public class ChannelManageSieveResponseWriter {
private final Channel channel;
@@ -36,7 +37,7 @@ public class ChannelManageSieveResponseW
public void write(String response) throws IOException {
if (channel.isConnected()) {
- InputStream in = new
ByteArrayInputStream(response.getBytes(StandardCharsets.UTF_8));
+ InputStream in = new
ByteArrayInputStream(response.getBytes(Charsets.UTF_8));
channel.write(new ChunkedStream(in));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
