svn commit: r1634316 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java

[kkolinko]

Author: kkolinko
Date: Sun Oct 26 12:51:20 2014
New Revision: 1634316

URL: http://svn.apache.org/r1634316
Log:
Simplify. Do not call toString() on values that are already strings.

This is backport of r1633448 and followup to r1633452 (BZ 57105).

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1633448

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1634316&r1=1634315&r2=1634316&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 Sun Oct 26 12:51:20 2014
@@ -41,25 +41,13 @@ public class ApplicationJspPropertyGroup
     
     @Override
     public String getBuffer() {
-        String result = null;
-        
-        if (jspPropertyGroup.getBuffer() != null) {
-            result = jspPropertyGroup.getBuffer().toString();
-        }
-        
-        return result;
+        return jspPropertyGroup.getBuffer();
     }
 
     
     @Override
     public String getDefaultContentType() {
-        String result = null;
-        
-        if (jspPropertyGroup.getDefaultContentType() != null) {
-            result = jspPropertyGroup.getDefaultContentType().toString();
-        }
-        
-        return result;
+        return jspPropertyGroup.getDefaultContentType();
     }
 
     
@@ -126,13 +114,7 @@ public class ApplicationJspPropertyGroup
     
     @Override
     public String getPageEncoding() {
-        String result = null;
-        
-        if (jspPropertyGroup.getPageEncoding() != null) {
-            result = jspPropertyGroup.getPageEncoding().toString();
-        }
-        
-        return result;
+        return jspPropertyGroup.getPageEncoding();
     }
 
     



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