[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tomcat-dev
Subject:    svn commit: r1803446 - /tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
From:       markt () apache ! org
Date:       2017-07-30 18:26:16
Message-ID: 20170730182619.234633A25CC () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: markt
Date: Sun Jul 30 18:26:15 2017
New Revision: 1803446

URL: http://svn.apache.org/viewvc?rev=1803446&view=rev
Log:
Refactor to simplify code and to remove a FindBugs warning

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1803446&r1=1803445&r2=1803446&view=diff
 ==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Sun Jul 30 \
18:26:15 2017 @@ -393,9 +393,12 @@ public class WebAnnotationSet {
 
             context.getNamingResources().addMessageDestinationRef(resource);
 
-        } else if (type.equals("javax.resource.cci.InteractionSpec") ||
-                type.equals("javax.transaction.UserTransaction") ||
-                true) {
+        } else {
+            /*
+             * General case. Also used for:
+             * - javax.resource.cci.InteractionSpec
+             * - javax.transaction.UserTransaction
+             */
 
             // resource-env-ref
             ContextResourceEnvRef resource = new ContextResourceEnvRef();



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


[prev in list] [next in list] [prev in thread] [next in thread]