From 5b7adc53f479ae4fbc97fb1c53df1c180a1549e7 Mon Sep 17 00:00:00 2001
From: David LaBissoniere <labisso@uchicago.edu>
Date: Fri, 9 Jul 2010 14:51:18 -0500
Subject: [PATCH] Fixed NPE when netsample network doesn't exist

---
 .../network/defaults/DefaultAssociationAdapter.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/service/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java b/service/service/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java
index 574d2b19..345a615f 100644
--- a/service/service/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java
+++ b/service/service/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 {