ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [16/16] incubator-ignite git commit: # IGNITE-406: Review.
Date Thu, 12 Mar 2015 14:59:51 GMT
# IGNITE-406: Review.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2234368
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2234368
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2234368

Branch: refs/heads/ignite-406
Commit: c2234368e9ad675151d17f13e1f84bee543e8c51
Parents: a79c428
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Mar 12 17:59:23 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Mar 12 17:59:23 2015 +0300

----------------------------------------------------------------------
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java    | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2234368/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
index 5c4d342..2e7254a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.hadoop.igfs;
 
 import org.apache.commons.logging.*;
 import org.apache.ignite.*;
+import org.apache.ignite.igfs.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.igfs.common.*;
 import org.apache.ignite.internal.util.*;
@@ -236,7 +237,7 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo {
 
         try {
             endpoint = IpcEndpointFactory.connectEndpoint(
-                    endpointAddr, new GridLoggerProxy(new HadoopIgfsJclLogger(log), null,
null, ""));
+                endpointAddr, new GridLoggerProxy(new HadoopIgfsJclLogger(log), null, null,
""));
 
             out = new IgfsDataOutputStream(new BufferedOutputStream(endpoint.outputStream()));
 
@@ -556,7 +557,7 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo {
 
                                 fut.onDone(res);
                             }
-                            catch (IgniteCheckedException e) {
+                            catch (IgfsException | IgniteCheckedException e) {
                                 if (log.isDebugEnabled())
                                     log.debug("Failed to apply response closure (will fail
request future): " +
                                         e.getMessage());
@@ -566,13 +567,9 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo {
                                 err = e;
                             }
                             catch (Throwable t) {
-                                err = t;
-
                                 fut.onDone(t);
 
-                                log.error("Failed to read data (connection will be closed)",
t);
-
-                                break;
+                                throw t;
                             }
                         }
                     }
@@ -587,15 +584,11 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo {
 
                 err = new HadoopIgfsCommunicationException(e);
             }
-            catch (IgniteCheckedException e) {
+            catch (Throwable e) {
                 if (!stopping)
                     log.error("Failed to obtain endpoint input stream (connection will be
closed)", e);
 
                 err = e;
-            } catch (Throwable t) {
-                err = t;
-
-                log.error("Failed to read data (connection will be closed)", t);
             }
             finally {
                 close0(err);


Mime
View raw message