xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkro...@apache.org
Subject svn commit: r125009 - /xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java /xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java /xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Date Thu, 13 Jan 2005 01:17:43 GMT
Author: kkrouse
Date: Wed Jan 12 17:17:41 2005
New Revision: 125009

URL: http://svn.apache.org/viewcvs?view=rev&rev=125009
Log:
throw BuildException if exception happens and failonerror=true

Modified:
   xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
   xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
   xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java

Modified: xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java?view=diff&rev=125009&p1=xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r1=125008&p2=xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r2=125009
==============================================================================
--- xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	(original)
+++ xmlbeans/branches/1.x-jdk1.3/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	Wed
Jan 12 17:17:41 2005
@@ -268,10 +268,15 @@
                 SchemaCodeGenerator.tryHardToDelete(tmpdir);
             }
         }
+        catch (BuildException e)
+        {
+            // re-throw anything thrown from javac or jar task
+            throw e;
+        }
         catch (Throwable e)
         {
             //interrupted means cancel
-            if (e instanceof InterruptedException)
+            if (e instanceof InterruptedException || failonerror)
                 throw new BuildException(e);
             
             log("Exception while building schemas: " + e.getMessage(), Project.MSG_ERR);

Modified: xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java?view=diff&rev=125009&p1=xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r1=125008&p2=xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r2=125009
==============================================================================
--- xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	(original)
+++ xmlbeans/branches/1.x/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	Wed Jan 12
17:17:41 2005
@@ -267,10 +267,15 @@
                 SchemaCodeGenerator.tryHardToDelete(tmpdir);
             }
         }
+        catch (BuildException e)
+        {
+            // re-throw anything thrown from javac or jar task
+            throw e;
+        }
         catch (Throwable e)
         {
             //interrupted means cancel
-            if (e instanceof InterruptedException)
+            if (e instanceof InterruptedException || failonerror)
                 throw new BuildException(e);
             
             log("Exception while building schemas: " + e.getMessage(), Project.MSG_ERR);

Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java?view=diff&rev=125009&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r1=125008&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java&r2=125009
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	(original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java	Wed Jan 12 17:17:41
2005
@@ -272,12 +272,17 @@
                 SchemaCodeGenerator.tryHardToDelete(tmpdir);
             }
         }
+        catch (BuildException e)
+        {
+            // re-throw anything thrown from javac or jar task
+            throw e;
+        }
         catch (Throwable e)
         {
             //interrupted means cancel
-            if (e instanceof InterruptedException)
+            if (e instanceof InterruptedException || failonerror)
                 throw new BuildException(e);
-
+            
             log("Exception while building schemas: " + e.getMessage(), Project.MSG_ERR);
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org


Mime
View raw message