You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/10/28 15:30:00 UTC

svn commit: r1767033 - in /qpid/java/branches/6.1.x: ./ broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java

Author: kwall
Date: Fri Oct 28 15:30:00 2016
New Revision: 1767033

URL: http://svn.apache.org/viewvc?rev=1767033&view=rev
Log:
QPID-7318 : Only exclude a managedoperation from acl checking generation if it has actually been processed before

Merged from trunk with command:
svn merge -c1766797 ^/qpid/java/trunk

Modified:
    qpid/java/branches/6.1.x/   (props changed)
    qpid/java/branches/6.1.x/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
    qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java

Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 15:30:00 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766806
+/qpid/java/trunk:1766797,1766806
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.1.x/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java?rev=1767033&r1=1767032&r2=1767033&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java (original)
+++ qpid/java/branches/6.1.x/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java Fri Oct 28 15:30:00 2016
@@ -24,10 +24,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -211,12 +209,13 @@ public class ConfiguredObjectFactoryGene
 
             for(Element element : typeElement.getEnclosedElements())
             {
-                if(element instanceof ExecutableElement && element.getKind() == ElementKind.METHOD && processedMethods.add(element.getSimpleName().toString()))
+                if(element instanceof ExecutableElement && element.getKind() == ElementKind.METHOD && !processedMethods.contains(element.getSimpleName().toString()))
                 {
                     for(AnnotationMirror annotationMirror : element.getAnnotationMirrors())
                     {
                         if(annotationMirror.getAnnotationType().toString().equals("org.apache.qpid.server.model.ManagedOperation"))
                         {
+                            processedMethods.add(element.getSimpleName().toString());
                             processManagedOperation(pw, className, (ExecutableElement) element, annotationMirror);
                             break;
                         }

Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1767033&r1=1767032&r2=1767033&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Fri Oct 28 15:30:00 2016
@@ -202,7 +202,6 @@ public interface VirtualHost<X extends V
 
     Broker<?> getBroker();
 
-    // LQ TODO: I think this is not being processed correctly because it is not annotated on the base. At least is does not show up in the generated overrides
     @Override
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
     Collection<? extends Connection<?>> getConnections();



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