svn commit: r1545344 - in /airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler: GFacHandlerException.java GridFTPOutputHandler.java

[lahiru]

Author: lahiru
Date: Mon Nov 25 17:06:43 2013
New Revision: 1545344

URL: http://svn.apache.org/r1545344
Log:
fixing standarerror reading during error and notify that back to xbaya.

Modified:
    
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GFacHandlerException.java
    
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPOutputHandler.java

Modified: 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GFacHandlerException.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GFacHandlerException.java?rev=1545344&r1=1545343&r2=1545344&view=diff
==============================================================================
--- 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GFacHandlerException.java
 (original)
+++ 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GFacHandlerException.java
 Mon Nov 25 17:06:43 2013
@@ -31,27 +31,16 @@ public class GFacHandlerException extend
 
     public GFacHandlerException(String message) {
         super(message, new Throwable(message));
-        sendFaultNotification(message, new Exception(message));
         log.error(message);
     }
 
     public GFacHandlerException(String s, Throwable throwable) {
         super(s, throwable);
-        sendFaultNotification(s, new Exception(throwable));
         log.error(s,throwable);
     }
 
     public GFacHandlerException(String message, Exception e, String... 
additionExceptiondata) {
         super(message, e);
-        sendFaultNotification(message, e, additionExceptiondata);
         log.error(message,e);
     }
-
-    private void sendFaultNotification(String message,
-                                        Exception e,
-                                       String... additionalExceptiondata) {
-        if (additionalExceptiondata == null || additionalExceptiondata.length 
== 0) {
-            additionalExceptiondata = new String[]{message, 
e.getLocalizedMessage()};
-        }
-    }
 }

Modified: 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPOutputHandler.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPOutputHandler.java?rev=1545344&r1=1545343&r2=1545344&view=diff
==============================================================================
--- 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPOutputHandler.java
 (original)
+++ 
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/GridFTPOutputHandler.java
 Mon Nov 25 17:06:43 2013
@@ -190,7 +190,7 @@ public class GridFTPOutputHandler implem
                     }
                 } catch (ToolsException e) {
                     log.error(e.getMessage());
-                    throw new GFacHandlerException(e.getMessage(), e, 
readLastLinesofStdOut(localStdErrFile.getPath(), 20));
+                    throw new GFacHandlerException(e.getMessage() + "\n 
StdError Data: \n" +readLastLinesofStdOut(localStdErrFile.getPath(), 20),e);
                 } catch (URISyntaxException e) {
                     log.error(e.getMessage());
                     throw new GFacHandlerException("URI is malformatted:" + 
e.getMessage(), e, readLastLinesofStdOut(localStdErrFile.getPath(), 20));