qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1716515 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model: Broker.java ConfiguredObjectTypeRegistry.java
Date Wed, 25 Nov 2015 19:23:25 GMT
Author: rgodfrey
Date: Wed Nov 25 19:23:25 2015
New Revision: 1716515

URL: http://svn.apache.org/viewvc?rev=1716515&view=rev
Log:
QPID-6911 : Fix issue discovered by [~k-wall]

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1716515&r1=1716514&r2=1716515&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Wed
Nov 25 19:23:25 2015
@@ -28,7 +28,7 @@ import org.apache.qpid.server.model.adap
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.stats.StatisticsGatherer;
 
-@ManagedObject( defaultType = "broker" )
+@ManagedObject( defaultType = "Broker" )
 public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>,
EventLoggerProvider, StatisticsGatherer
 {
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1716515&r1=1716514&r2=1716515&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
Wed Nov 25 19:23:25 2015
@@ -432,9 +432,12 @@ public class ConfiguredObjectTypeRegistr
                     }
                 }
             }
-            if(typeClass == null && typeName.equals(category.getSimpleName().toLowerCase()))
+            if(typeClass == null)
             {
-                typeClass = category;
+                if(typeName.equals(category.getSimpleName()))
+                {
+                    typeClass = category;
+                }
             }
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message