svn commit: r1633448 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java

[markt]

Author: markt
Date: Tue Oct 21 20:21:46 2014
New Revision: 1633448

URL: http://svn.apache.org/r1633448
Log:
Simplify. These values are already Strings.

Modified:
    
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java?rev=1633448&r1=1633447&r2=1633448&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroupDescriptorImpl.java
 Tue Oct 21 20:21:46 2014
@@ -37,25 +37,13 @@ public class JspPropertyGroupDescriptorI
 
     @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();
     }
 
 
@@ -122,13 +110,7 @@ public class JspPropertyGroupDescriptorI
 
     @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