svn commit: r884914 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Fri Nov 27 17:17:12 2009
New Revision: 884914

URL: http://svn.apache.org/viewvc?rev=884914&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48282
Correct possible NPE
Patch provided by sebb

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=884914&r1=884913&r2=884914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Nov 27 
17:17:12 2009
@@ -429,8 +429,10 @@
         Iterator<ManagedBean> items = descriptors.values().iterator();
         while (items.hasNext()) {
             ManagedBean item = items.next();
-            if ((group == null) && (item.getGroup() == null)) {
-                results.add(item.getName());
+            if ((group == null)) {
+                if (item.getGroup() == null){
+                    results.add(item.getName());
+                }
             } else if (group.equals(item.getGroup())) {
                 results.add(item.getName());
             }
@@ -678,7 +680,7 @@
         } else if( source instanceof InputStream ) {
             type=param;
             inputsource=source;
-        } else if( source instanceof Class ) {
+        } else if( source instanceof Class<?> ) {
             location=((Class<?>)source).getName();
             type=param;
             inputsource=source;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org