[jboss-svn-commits] JBL Code SVN: r23713 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2008-11-05 07:54:27 -0500 (Wed, 05 Nov 2008)
New Revision: 23713

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/Generator.java
Log:
merged https://jira.jboss.org/jira/browse/JBESB-1894 from trunk

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/Generator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/Generator.java	2008-11-05 11:31:12 UTC (rev 23712)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/Generator.java	2008-11-05 12:54:27 UTC (rev 23713)
@@ -259,12 +259,20 @@
             List<Service> services = getServices();
 
             for(Service service : services) {
-				for(Listener serviceListener : service.getListeners().getListenerList()) {
-					if(serviceListener == listener) {
-						return service;
-					}
-				}
-			}
+                ListenersDocument.Listeners listeners = service.getListeners();
+
+                if(listeners != null) {
+                    List<Listener> listenerList = listeners.getListenerList();
+
+                    if(listenerList != null) {
+                        for(Listener serviceListener : listenerList) {
+                            if(serviceListener == listener) {
+                                return service;
+                            }
+                        }
+                    }
+                }
+            }
 			
 			throw new IllegalStateException("No Service instance found for the supplied Listener instance.  This should not be possible if the Listener instance was provided by this configuration.  Where has this Listener instance come from?");
 		}