You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsif-dev@ws.apache.org by wh...@apache.org on 2003/04/02 15:51:22 UTC
cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers InvocationHelper.java
whitlock 2003/04/02 05:51:22
Modified: java/test/mime MimeTest.java MimeImpl.java
java/src/org/apache/wsif/providers InvocationHelper.java
Log:
Attachments fixes
Revision Changes Path
1.28 +3 -3 xml-axis-wsif/java/test/mime/MimeTest.java
Index: MimeTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeTest.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MimeTest.java 31 Mar 2003 14:05:48 -0000 1.27
+++ MimeTest.java 2 Apr 2003 13:51:19 -0000 1.28
@@ -453,9 +453,9 @@
doit("SOAPJMSPort", SEND_AP, "Mime.wsdl");
}
- public void testInputOnlyUnrefJms() {
- doit("SOAPJMSPort", INPUTONLY_UNREF, "Mime.wsdl");
- }
+// public void testInputOnlyUnrefJms() {
+// doit("SOAPJMSPort", INPUTONLY_UNREF, "Mime.wsdl");
+// }
//
// public void testInputOnlyRefJms() {
// doit("SOAPJMSPort", INPUTONLY_REF, "Mime.wsdl");
1.20 +27 -42 xml-axis-wsif/java/test/mime/MimeImpl.java
Index: MimeImpl.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MimeImpl.java 28 Mar 2003 14:41:51 -0000 1.19
+++ MimeImpl.java 2 Apr 2003 13:51:20 -0000 1.20
@@ -239,22 +239,13 @@
}
public DataHandler optionalSoapBody(DataHandler ds) {
- if (verbose)
- System.out.println(
- "MimeImpl.optionalSoapBody ds="
- + (ds == null ? "<null>" : ds.toString()));
+ print("MimeImpl.optionalSoapBody ds=",ds);
String s = dataHandlerToString(ds);
- if (verbose)
- System.out.println(
- "MimeImpl.optionalSoapBody s="
- + (s == null ? "<null>" : s));
+ print("MimeImpl.optionalSoapBody s=",s);
DataHandler dh = stringToDataHandler(s);
- if (verbose)
- System.out.println(
- "MimeImpl.optionalSoapBody dh="
- + (dh == null ? "<null>" : dh.toString()));
+ print("MimeImpl.optionalSoapBody dh=",dh);
return dh;
}
@@ -307,31 +298,15 @@
}
public void putRefDhInputOnly(DataHandler dh) {
- if (verbose)
- System.out.println(
- "MimeImpl.putRefDhInputOnly dh="
- + (dh == null ? "<null>" : dh.toString()));
-
+ print("MimeImpl.putRefDhInputOnly dh=",dh);
this.stored = dataHandlerToString(dh);
-
- if (verbose)
- System.out.println(
- "MimeImpl.putRefDhInputOnly stored="
- + (stored == null ? "<null>" : stored));
+ print("MimeImpl.putRefDhInputOnly stored=",stored);
}
public DataHandler getRefDh() {
- if (verbose)
- System.out.println(
- "MimeImpl.getRefDh stored="
- + (stored == null ? "<null>" : stored));
-
+ print("MimeImpl.getRefDh stored=",stored);
DataHandler dh = stringToDataHandler(this.stored);
-
- if (verbose)
- System.out.println(
- "MimeImpl.getRefDh dh="
- + (dh == null ? "<null>" : dh.toString()));
+ print("MimeImpl.getRefDh dh=",dh);
return dh;
}
@@ -339,19 +314,11 @@
List l = getUnrefAttachments();
DataHandler dh = ((WSIFAttachmentPart) l.get(0)).getDataHandler();
this.stored = dataHandlerToString(dh);
-
- if (verbose)
- System.out.println(
- "MimeImpl.putUnrefDhInputOnly stored="
- + (stored == null ? "<null>" : stored));
+ print("MimeImpl.putUnrefDhInputOnly stored=",stored);
}
public void getUnrefDh() {
- if (verbose)
- System.out.println(
- "MimeImpl.getUnrefDh stored="
- + (stored == null ? "<null>" : stored));
-
+ print("MimeImpl.getUnrefDh stored=",stored);
WSIFAttachmentPart wap =
new WSIFAttachmentPart(stringToDataHandler(stored));
ArrayList l = new ArrayList();
@@ -414,6 +381,7 @@
(List) context.getObjectPart(
WSIFConstants.UNREFERENCED_ATTACHMENT_PART_NAME);
} catch (Exception e) {
+ print("MimeImpl.getUnrefAttachments - Java - ", e);
errText += e.toString() + "\n";
}
@@ -424,6 +392,7 @@
Object o = m.invoke(null, null);
l = (List) o;
} catch (Exception e) {
+ print("MimeImpl.getUnrefAttachments - Axis - ", e);
errText += e.toString() + "\n";
}
}
@@ -440,6 +409,7 @@
WSIFConstants.UNREFERENCED_ATTACHMENT_PART_NAME,
l);
} catch (Exception e) {
+ print("MimeImpl.putUnrefAttachments - Java - ", e);
success = false;
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
@@ -456,6 +426,7 @@
m.invoke(null, new Object[] { l });
success = true;
} catch (Exception e) {
+ print("MimeImpl.putUnrefAttachments - Axis - ", e);
success = false;
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
@@ -463,6 +434,20 @@
}
}
+ print("MimeImpl.putUnrefAttachments - returning ", new Boolean(success));
return success;
+ }
+
+ private void print(Object o1) {
+ if (verbose) {
+ System.out.println(o1==null?"<null>":o1.toString());
+ }
+ }
+
+ private void print(Object o1, Object o2) {
+ if (verbose) {
+ System.out.println((o1==null?"<null>":o1.toString())+
+ (o2==null?"<null>":o2.toString()));
+ }
}
}
1.4 +2 -15 xml-axis-wsif/java/src/org/apache/wsif/providers/InvocationHelper.java
Index: InvocationHelper.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/InvocationHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvocationHelper.java 31 Mar 2003 14:05:49 -0000 1.3
+++ InvocationHelper.java 2 Apr 2003 13:51:21 -0000 1.4
@@ -67,18 +67,13 @@
* @author Mark Whitlock
*/
public class InvocationHelper {
- private static ThreadLocal context = new ThreadLocal();
- private static boolean set = false;
+ transient private static ThreadLocal context = new ThreadLocal();
private InvocationHelper() {
}
- public static WSIFMessage getMessageContext() throws WSIFException {
+ public static WSIFMessage getMessageContext() {
Trc.entry(null);
- if (!set) {
- throw new WSIFException("Message context not set");
- }
-
WSIFMessage ctxt = (WSIFMessage) context.get();
Trc.exit(ctxt);
return ctxt;
@@ -88,14 +83,6 @@
throws WSIFException {
Trc.entry(null, ctxt);
context.set(ctxt);
- set = true;
- Trc.exit();
- }
-
- public static void unsetMessageContext()
- throws WSIFException {
- Trc.entry(null);
- set = false;
Trc.exit();
}
}