Fixed NPE when netsample network doesn't exist

nimbusproject · Jul 9, 2010 · 5b7adc5 · 5b7adc5
1 parent 06109dc
commit 5b7adc5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...vice/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java b/...vice/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java
@@ -199,11 +199,12 @@ private void writeNetworkFiles(Map<String,Association> associations) {
         if (this.netSampleResource != null) {
             if (this.netSampleNetwork != null && this.netSampleNetwork.length() != 0) {
                 final Association assoc = associations.get(this.netSampleNetwork);
-                final List entries = assoc.getEntries();
-                if (entries == null || entries.isEmpty()) {
+
+                if (assoc == null || assoc.getEntries() == null || assoc.getEntries().isEmpty()) {
                     logger.warn ("Not writing netsample file because network '" +
-                            this.netSampleNetwork + "' has no entries");
+                            this.netSampleNetwork + "' does not exist or has no entries");
                 } else {
+                    final List entries = assoc.getEntries();
                     final File netsampleFile;
                     try {