[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mina-commits
Subject:    svn commit: r649888 -
From:       trustin () apache ! org
Date:       2008-04-20 5:17:17
Message-ID: 20080420051718.424441A9832 () eris ! apache ! org
[Download RAW message or body]

Author: trustin
Date: Sat Apr 19 22:17:16 2008
New Revision: 649888

URL: http://svn.apache.org/viewvc?rev=649888&view=rev
Log:
Fixed issue: DIRMINA-570 - NullPointerException in NioProcessor.transferFile
* Made sure to ignore a null exception message

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java


Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
                
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java?rev=649888&r1=649887&r2=649888&view=diff
 ==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java \
                (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java \
Sat Apr 19 22:17:16 2008 @@ -52,7 +52,7 @@
 
     public NioProcessor(Executor executor) {
         super(executor);
-        this.selector = newSelector();
+        selector = newSelector();
     }
 
     @Override
@@ -191,8 +191,10 @@
         try {
             return (int) region.getFileChannel().transferTo(region.getPosition(), \
length, session.getChannel());  } catch (IOException e) {
-            // Check to see if the IOException is being thrown due to \
                http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5103988
-            if (e.getMessage().contains("Resource temporarily unavailable")) {
+            // Check to see if the IOException is being thrown due to
+            // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5103988
+            String message = e.getMessage();
+            if (message != null && message.contains("temporarily unavailable")) {
                 return 0;
             } else {
                 throw e;


[prev in list] [next in list] [prev in thread] [next in thread]