Tag: cws_dev300_dba31a
User: oj      
Date: 2008-07-07 12:22:57+0000
Modified:
   dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java
   dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java
   dba/reportdesign/java/com/sun/star/report/pentaho/StarReportDataFactory.java

Log:
 #i85664# exception handling corrected

File Changes:

Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/
==============================================================

File [changed]: PentahoReportJob.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java?r1=1.7&r2=1.7.4.1
Delta lines:  +6 -3
-------------------
--- PentahoReportJob.java       2008-06-25 14:14:25+0000        1.7
+++ PentahoReportJob.java       2008-07-07 12:22:55+0000        1.7.4.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PentahoReportJob.java,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -350,7 +350,10 @@
         }
         catch (final Exception e)
         {
-            throw new ReportExecutionException("Failed to process the report", 
e);
+            String message = e.getMessage();
+            if ( message.length() == 0 )
+                message = "Failed to process the report";
+            throw new ReportExecutionException(message, e);
         }
 
     }

File [changed]: SOReportJobFactory.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java?r1=1.6&r2=1.6.12.1
Delta lines:  +3 -3
-------------------
--- SOReportJobFactory.java     2008-06-16 13:07:17+0000        1.6
+++ SOReportJobFactory.java     2008-07-07 12:22:55+0000        1.6.12.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: SOReportJobFactory.java,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.12.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -171,7 +171,7 @@
             catch (java.lang.Exception e)
             {
                 Log.error("ReportProcessing failed", e);
-                throw new com.sun.star.lang.WrappedTargetException("caught a " 
+ e.getClass().getName(), this, new 
com.sun.star.uno.Exception(e.getLocalizedMessage()));
+                throw new 
com.sun.star.lang.WrappedTargetException(e.getMessage(), this,null);
             }
             catch (java.lang.IncompatibleClassChangeError e2)
             {

File [changed]: StarReportDataFactory.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/StarReportDataFactory.java?r1=1.4&r2=1.4.18.1
Delta lines:  +10 -4
--------------------
--- StarReportDataFactory.java  2008-05-05 13:42:41+0000        1.4
+++ StarReportDataFactory.java  2008-07-07 12:22:55+0000        1.4.18.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: StarReportDataFactory.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -75,11 +75,17 @@
     }
     catch(DataSourceException dse)
     {
-      throw new ReportDataFactoryException("Failed to create report data 
wrapper");
+        String message = dse.getMessage();
+        if ( message.length() == 0 )
+            message = "Failed to create report data wrapper";
+      throw new ReportDataFactoryException(message,dse);
     }
     catch (org.jfree.report.DataSourceException e)
     {
-      throw new ReportDataFactoryException("Failed to query data");
+        String message = e.getMessage();
+        if ( message.length() == 0 )
+            message = "Failed to query data";
+      throw new ReportDataFactoryException(message);
     }
   }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to