SCOUT-122, handle a null response, so errors are not NPEs and can be understood more easily.
git-svn-id: https://svn.apache.org/repos/asf/juddi/scout/trunk@1226926 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ws/scout/registry/AuthTokenV3Singleton.java b/src/main/java/org/apache/ws/scout/registry/AuthTokenV3Singleton.java
index 74d753d..f9c3485 100644
--- a/src/main/java/org/apache/ws/scout/registry/AuthTokenV3Singleton.java
+++ b/src/main/java/org/apache/ws/scout/registry/AuthTokenV3Singleton.java
@@ -25,7 +25,7 @@
if (instance == null) {
instance = new AuthTokenV3Singleton();
}
- cachedAuthTokenHash.put(username, token);
+ if (token!=null) cachedAuthTokenHash.put(username, token);
}
public synchronized static void deleteAuthToken(String username) {
diff --git a/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java b/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java
index badaabd..ec2c829 100644
--- a/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java
+++ b/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java
@@ -900,9 +900,10 @@
getAuthTokenURI = this.getPublishURI();
}
- AuthToken at;
+ AuthToken at = null;
JAXBElement<?> o = execute(this.objectFactory.createGetAuthToken(request),
getAuthTokenURI);
+ if (o!=null)
at = (AuthToken) o.getValue();
return at;
diff --git a/src/main/java/org/apache/ws/scout/transport/LocalTransport.java b/src/main/java/org/apache/ws/scout/transport/LocalTransport.java
index 9d72fa2..485f630 100644
--- a/src/main/java/org/apache/ws/scout/transport/LocalTransport.java
+++ b/src/main/java/org/apache/ws/scout/transport/LocalTransport.java
@@ -61,7 +61,7 @@
Object requestHandler = c.newInstance();
Method method = c.getMethod(methodName, Element.class);
Node node = (Node) method.invoke(requestHandler, request);
- if (node.getFirstChild()!=null) {
+ if (node!=null && node.getFirstChild()!=null) {
response = (Element) node.getFirstChild();
}
} catch (Exception ex) {
