svn commit: r959173 - in /ant/core/trunk/src/main/org/apache/tools/ant: taskdefs/Execute.java util/DOMElementWriter.java

[bo...@apache.org]

Author: bodewig
Date: Wed Jun 30 03:21:29 2010
New Revision: 959173

URL: http://svn.apache.org/viewvc?rev=959173&view=rev
Log:
address efficiency concerns

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
    ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java?rev=959173&r1=959172&r2=959173&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java Wed Jun 30 03:21:29 2010
@@ -498,7 +498,6 @@ public class Execute {
                 watchdog.stop();
             }
             streamHandler.stop();
-            closeStreams(process);
 
             if (watchdog != null) {
                 watchdog.checkException();

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java?rev=959173&r1=959172&r2=959173&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java Wed Jun 30 03:21:29 2010
@@ -45,6 +45,13 @@ public class DOMElementWriter {
 
     private static final int HEX = 16;
 
+    private static final String[] WS_ENTITIES = new String['\r' - '\t' + 1];
+    static {
+        for (int i = '\t'; i < '\r' + 1; i++) {
+            WS_ENTITIES[i - '\t'] = "&#x" + Integer.toHexString(i) + ";";
+        }
+    }
+
     /** prefix for generated prefixes */
     private static final String NS = "ns";
 
@@ -425,11 +432,11 @@ public class DOMElementWriter {
         return encode(value, true);
     }
 
-    private String encode(String value, boolean encodeWhitespace) {
-        int len = value.length();
-        StringBuffer sb = new StringBuffer(len);
+    private String encode(final String value, final boolean encodeWhitespace) {
+        final int len = value.length();
+        final StringBuffer sb = new StringBuffer(len);
         for (int i = 0; i < len; i++) {
-            char c = value.charAt(i);
+            final char c = value.charAt(i);
             switch (c) {
             case '<':
                 sb.append("&lt;");
@@ -450,7 +457,7 @@ public class DOMElementWriter {
             case '\n':
             case '\t':
                 if (encodeWhitespace) {
-                    sb.append("&#x").append(Integer.toHexString(c)).append(";");
+                    sb.append(WS_ENTITIES[c - '\t']);
                 } else {
                     sb.append(c);
                 }
@@ -482,10 +489,10 @@ public class DOMElementWriter {
 
      */
     public String encodedata(final String value) {
-        int len = value.length();
+        final int len = value.length();
         StringBuffer sb = new StringBuffer(len);
         for (int i = 0; i < len; ++i) {
-            char c = value.charAt(i);
+            final char c = value.charAt(i);
             if (isLegalCharacter(c)) {
                 sb.append(c);
             }
@@ -543,7 +550,7 @@ public class DOMElementWriter {
      * @return true if the character is allowed.
      * @since 1.10, Ant 1.5
      */
-    public boolean isLegalCharacter(char c) {
+    public boolean isLegalCharacter(final char c) {
         // CheckStyle:MagicNumber OFF
         if (c == 0x9 || c == 0xA || c == 0xD) {
             return true;