geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r899308 - /geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff
Date Thu, 14 Jan 2010 17:17:17 GMT
Author: dblevins
Date: Thu Jan 14 17:17:16 2010
New Revision: 899308

URL: http://svn.apache.org/viewvc?rev=899308&view=rev
Log:
Previous diff had a diff for this same file (which is a diff) and was a little messed up.
 Cleaned up.

Modified:
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff?rev=899308&r1=899307&r2=899308&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff Thu Jan 14 17:17:16 2010
@@ -81,104 +81,3 @@
 +        }
      }
  }
-Index: SunCompatible.diff
-===================================================================
---- SunCompatible.diff	(revision 893025)
-+++ SunCompatible.diff	(working copy)
-@@ -1,30 +1,27 @@
- Index: src/main/java/javax/ejb/EJBException.java
- ===================================================================
----- src/main/java/javax/ejb/EJBException.java	(revision 890521)
-+--- src/main/java/javax/ejb/EJBException.java	(revision 893040)
- +++ src/main/java/javax/ejb/EJBException.java	(working copy)
--@@ -34,13 +34,13 @@
-- public class EJBException extends RuntimeException {
-+@@ -37,11 +37,10 @@
-+     private Exception causeException;
-  
--     private static final long serialVersionUID = 796770993296843510L;
--+    private Exception ex;
-- 
-      public EJBException() {
- -        super();
-      }
-  
--     public EJBException(Exception ex) {
---        super(ex);
--+        this.ex = ex;
-+     public EJBException(Exception causeException) {
-+-        super(causeException);
-++        this.causeException = causeException;
-      }
-  
-      public EJBException(String message) {
--@@ -48,15 +48,12 @@
-+@@ -49,33 +48,52 @@
-      }
-  
--     public EJBException(String message, Exception ex) {
---        super(message, ex);
-+     public EJBException(String message, Exception causeException) {
-+-        super(message, causeException);
- +        super(message);
--+        this.ex = ex;
-++        this.causeException = causeException;
-      }
-  
-      public Exception getCausedByException() {
-@@ -33,7 +30,54 @@
- -            return (Exception) cause;
- -        }
- -        return null;
--+        return ex;
-++        return causeException;
-      }
-  
-      public String getMessage() {
-+-        return super.getMessage();
-++
-++        if (causeException == null) return super.getMessage();
-++
-++        StringBuilder sb = new StringBuilder();
-++
-++        if (super.getMessage() != null) {
-++            sb.append(super.getMessage());
-++            sb.append("; ");
-++        }
-++
-++        sb.append("nested exception is: ");
-++        sb.append(causeException.toString());
-++
-++        return sb.toString();
-+     }
-+ 
-+-
-+     public void printStackTrace(PrintStream ps) {
-+-        super.printStackTrace(ps);
-++        if (causeException == null) {
-++            super.printStackTrace(ps);
-++        } else synchronized (ps) {
-++            ps.println(this);
-++            causeException.printStackTrace(ps);
-++            super.printStackTrace(ps);
-++        }
-+     }
-+ 
-+-
-+     public void printStackTrace() {
-+-        super.printStackTrace();
-++        printStackTrace(System.err);
-+     }
-+ 
-+-
-+     public void printStackTrace(PrintWriter pw) {
-+-        super.printStackTrace(pw);
-++        if (causeException == null) {
-++            super.printStackTrace(pw);
-++        } else synchronized (pw) {
-++            pw.println(this);
-++            causeException.printStackTrace(pw);
-++            super.printStackTrace(pw);
-++        }
-+     }
-+ }



Mime
View raw message