svn commit: r1597596 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: ServerListener.java TomcatJndiBuilder.java

[andygumbrecht]

Author: andygumbrecht
Date: Mon May 26 14:38:26 2014
New Revision: 1597596

URL: http://svn.apache.org/r1597596
Log:
PMD

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1597596&r1=1597595&r2=1597596&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
 Mon May 26 14:38:26 2014
@@ -200,7 +200,7 @@ public class ServerListener implements L
             final int slash = value.indexOf('/');
             field.setAccessible(true);
             final String version = OpenEjbVersion.get().getVersion();
-            final String tomeeVersion = (Integer.parseInt("" + 
version.charAt(0)) - 3) + version.substring(1, version.length());
+            final String tomeeVersion = 
(Integer.parseInt(Integer.toString(version.charAt(0))) - 3) + 
version.substring(1, version.length());
             field.set(null, value.substring(0, slash) + " (TomEE)" + 
value.substring(slash) + " (" + tomeeVersion + ")");
         } catch (final Exception e) {
             // no-op

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1597596&r1=1597595&r2=1597596&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 Mon May 26 14:38:26 2014
@@ -446,7 +446,7 @@ public class TomcatJndiBuilder {
         ejb.setLink(null);
         ejb.setType(ref.interfaceClassName);
         if (useCrossClassLoaderRef) {
-            ejb.setProperty(NamingUtil.EXTERNAL, "" + ref.externalReference);
+            ejb.setProperty(NamingUtil.EXTERNAL, 
Boolean.toString(ref.externalReference));
         }
 
         if (ref.ejbDeploymentId != null) {
@@ -538,7 +538,7 @@ public class TomcatJndiBuilder {
         if (ref.persistenceUnitName != null) {
             resource.setProperty(NamingUtil.UNIT, ref.persistenceUnitName);
         }
-        resource.setProperty(NamingUtil.EXTENDED, "" + ref.extended);
+        resource.setProperty(NamingUtil.EXTENDED, 
Boolean.toString(ref.extended));
 
         if (ref.location != null) {
             resource.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);