From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Tue, 9 Jun 2009 09:57:34 +0000 (+0000)
Subject: - avoid unnecesssary exception wrapping
X-Git-Tag: gridsite-core_R_1_7_1~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=01993e8785594e5e4881973bfe7f640f22b67f23;p=jra1mw.git

- avoid unnecesssary exception wrapping
- handle Axis fault in example explicitely
---

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index b2e1f6c..9a1a9f7 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -17,7 +17,7 @@ examples: ${EXAMPLES}
 
 
 ${EXAMPLES}: %.class: %.java
-	${jdk_prefix}/bin/javac -cp build/classes/:${stagedir}/share/java/jobid-api-java.jar $<
+	${jdk_prefix}/bin/javac -cp build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $<
 
 
 check:
diff --git a/org.glite.lb.client-java/examples/QueryDemo.java b/org.glite.lb.client-java/examples/QueryDemo.java
index 07410ae..0c48e84 100644
--- a/org.glite.lb.client-java/examples/QueryDemo.java
+++ b/org.glite.lb.client-java/examples/QueryDemo.java
@@ -17,7 +17,7 @@ import org.glite.wsdl.types.lb.QueryRecValue;
 import org.glite.wsdl.types.lb.QueryRecord;
 import org.glite.wsdl.types.lb.StatName;
 import org.glite.wsdl.types.lb.Timeval;
-
+import org.apache.axis.AxisFault;
 
 
 /**
@@ -240,7 +240,18 @@ public class QueryDemo {
                     System.out.println(jobStatusToString(statusit.next()));
                 }
             }
-          } catch (Exception e) { e.printStackTrace(); }
+          } catch (Exception e)
+	  {
+		Throwable cause = e.getCause();
+
+		if (cause != null && cause instanceof AxisFault) {
+			cause.printStackTrace();
+		}
+		else {
+			System.err.println("Oops");
+			e.printStackTrace();
+		}
+	  }
         }
     }
 }
diff --git a/org.glite.lb.client-java/src/org/glite/lb/Job.java b/org.glite.lb.client-java/src/org/glite/lb/Job.java
index e33365c..2344adc 100644
--- a/org.glite.lb.client-java/src/org/glite/lb/Job.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/Job.java
@@ -126,11 +126,7 @@ public class Job {
             throw new IllegalStateException("serverConnection is null, please set it");
         if (jobId == null)
             throw new IllegalStateException("jobId is null, please set it");
-        try {
-            return serverConnection.jobState(jobId.toString(), flags);
-        } catch (LBException ex) {
-            throw new LBException(ex);
-        }
+        return serverConnection.jobState(jobId.toString(), flags);
     }
   
 	/**