maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r426660 - in /maven/maven-1/core/trunk/src/java/org/apache/maven: MavenUtils.java cli/App.java jelly/JellyUtils.java plugin/PluginScriptParser.java util/Expand.java
Date Fri, 28 Jul 2006 20:20:45 GMT
Author: ltheussl
Date: Fri Jul 28 13:20:44 2006
New Revision: 426660

URL: http://svn.apache.org/viewvc?rev=426660&view=rev
Log:
Log debug messages if streams cannot be closed.

Modified:
    maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
    maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java
    maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java
    maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java
    maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java?rev=426660&r1=426659&r2=426660&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java Fri Jul 28 13:20:44
2006
@@ -206,7 +206,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // Nothing to do
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
                 fr = null;
             }
@@ -732,7 +732,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // Nothing to do
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
                 fis = null;
             }

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java?rev=426660&r1=426659&r2=426660&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java Fri Jul 28 13:20:44 2006
@@ -860,7 +860,7 @@
                     }
                     catch ( IOException e )
                     {
-                        // Nothing to do
+                        log.debug( "WARNING: Cannot close stream!", e );
                     }
                     fis = null;
                 }
@@ -1031,6 +1031,7 @@
             }
             catch ( IOException e )
             {
+                log.debug( "WARNING: Cannot close stream!", e );
             }
         }
 

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java?rev=426660&r1=426659&r2=426660&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java Fri Jul 28 13:20:44
2006
@@ -137,7 +137,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // Nothing to do
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
                 fis = null;
             }
@@ -174,7 +174,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // Nothing to do
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
                 fis = null;
             }
@@ -259,7 +259,7 @@
                     }
                     catch ( IOException e )
                     {
-                        // Nothing to do
+                        log.debug( "WARNING: Cannot close stream!", e );
                     }
                     isr = null;
                 }

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java?rev=426660&r1=426659&r2=426660&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java Fri
Jul 28 13:20:44 2006
@@ -100,12 +100,14 @@
             {
                 importUri = attributes.getValue( "file" );
             }
+            /*
             if ( importUri != null )
             {
                 // We -could- evaluate this as an expression, but the only thing set at this
point is ${basedir}
                 // and some expressions will spit out exceptions (eg ${context.getVariable('blah')})
                 // TODO: maybe sub in basedir, plugin.resources and plugin.dir?
             }
+            */
 
             if ( importUri == null )
             {
@@ -139,7 +141,7 @@
                         }
                         catch ( IOException e )
                         {
-                            // Nothing to do
+                            log.debug( "WARNING: Cannot close stream!", e );
                         }
                     }
                 }
@@ -174,10 +176,12 @@
             String name = attributes.getValue( "name" );
             handler.addPostGoal( name, jellyScriptHousing );
         }
+        /*
         else if ( "attainGoal".equals( rawName ) )
         {
             // Use lazy version
         }
+        */
         else if ( "taglib".equals( localName ) && "jelly:define".equals( uri ) )
         {
             String tagLibUri = attributes.getValue( "uri" );
@@ -223,7 +227,7 @@
     /**
      * Print parse error to Sytem.err
      */
-    private final void printParseError( String type, SAXParseException spe )
+    private void printParseError( String type, SAXParseException spe )
     {
         log
             .error( type + " [line " + spe.getLineNumber() + ", row " + spe.getColumnNumber()
+ "]: "

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java?rev=426660&r1=426659&r2=426660&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java Fri Jul 28 13:20:44
2006
@@ -100,7 +100,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // intentionally left blank
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
             }
             if ( zis != null )
@@ -111,7 +111,7 @@
                 }
                 catch ( IOException e )
                 {
-                    // intentionally left blank
+                    log.debug( "WARNING: Cannot close stream!", e );
                 }
             }
         }
@@ -173,7 +173,7 @@
                     }
                     catch ( IOException e )
                     {
-                        // intentionally left blank
+                        log.debug( "WARNING: Cannot close stream!", e );
                     }
                 }
             }



Mime
View raw message