cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r416337 - in /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util: MIMEUtils.java PostInputStream.java TraxErrorHandler.java
Date Thu, 22 Jun 2006 11:52:05 GMT
Author: cziegeler
Date: Thu Jun 22 04:52:04 2006
New Revision: 416337

URL: http://svn.apache.org/viewvc?rev=416337&view=rev
Log:
Sync with changes from 2.1.x

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java?rev=416337&r1=416336&r2=416337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java Thu
Jun 22 04:52:04 2006
@@ -147,7 +147,7 @@
             if (line.startsWith("#")) {
                 continue;
             }
-            if (line.trim().equals("")) {
+            if (line.trim().length() == 0) {
                 continue;
             }
             StringTokenizer tok = new StringTokenizer(line, " \t");

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java?rev=416337&r1=416336&r2=416337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/PostInputStream.java
Thu Jun 22 04:52:04 2006
@@ -91,13 +91,14 @@
         }
         init(input, len);
     }
+
     /**
     * Returns the underlying input stream.
     *
     * @return inputStream the underlying InputStream.
     */
     public InputStream getInputStream() {
-        return( m_inputStream );
+        return m_inputStream;
     }
 
     /**

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java?rev=416337&r1=416336&r2=416337&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
Thu Jun 22 04:52:04 2006
@@ -88,7 +88,7 @@
 
         SourceLocator locator = exception.getLocator();
         if ( null != locator ) {
-            String id = ( locator.getPublicId() != locator.getPublicId() )
+            String id = ( !locator.getPublicId().equals(locator.getPublicId()))
                     ? locator.getPublicId()
                     : ( null != locator.getSystemId() )
                     ? locator.getSystemId() : "SystemId Unknown";



Mime
View raw message