[Swift-commit] cog r3895

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3895 | hategan | 2014-05-01 22:18:18 -0500 (Thu, 01 May 2014) | 1 line

fixed npe on instantiation of SSH (and others) FileResource with default constructor (bug 1255)
------------------------------------------------------------------------
Index: modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java
===================================================================
--- modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java	(revision 3894)
+++ modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java	(working copy)
@@ -44,9 +44,11 @@
         this();
         this.provider = provider;
         if (serviceContact == null) {
-            throw new NullPointerException("serviceContact");
+            this.serviceContact = DEFAULT_CONTACT;
         }
-        this.serviceContact = serviceContact;
+        else {
+            this.serviceContact = serviceContact;
+        }
         this.securityContext = securityContext;
     }