You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2005/02/10 14:08:43 UTC
cvs commit: ws-axis/c/tools/org/apache/axis/tools/trace Tracer.java
whitlock 2005/02/10 05:08:43
Modified: c/src/common AxisTrace.cpp AxisTrace.h
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
BeanParamWriter.java
c/tools/org/apache/axis/tools/trace Tracer.java
Log:
Fix AxisBench on linux in deserializing arrays of nillable complex types
Remove AxisTrace compiler warnings
Remove unsigned double since doubles can't be unsigned in C
Revision Changes Path
1.56 +3 -4 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- AxisTrace.cpp 3 Feb 2005 09:55:59 -0000 1.55
+++ AxisTrace.cpp 10 Feb 2005 13:08:43 -0000 1.56
@@ -193,11 +193,11 @@
struct tm *tm = localtime(¤t);
// TODO: Milliseconds
+ // Use %Y not %y because %y gives a compiler warning on Linux
const int timelen=256;
char strtime[timelen];
memset(strtime,0,timelen);
- strftime(strtime,timelen,"[%d/%m/%y %H:%M:%S:000 %Z]",tm);
- strtime[timelen-1]='\0';
+ strftime(strtime,timelen,"[%d/%m/%Y %H:%M:%S:000 %Z]",tm);
string text = strtime;
text += " 1 "; // TODO: this should be the thread id
@@ -342,8 +342,7 @@
case TRACETYPE_INT: sprintf(prim,"%d" ,*((int *)value)); line += prim; break;
case TRACETYPE_ULONG: sprintf(prim,"%lu",*((long *)value)); line += prim; break;
case TRACETYPE_LONG: sprintf(prim,"%ld",*((long *)value)); line += prim; break;
- case TRACETYPE_UDOUBLE: sprintf(prim,"%Lu",*((double*)value)); line += prim; break;
- case TRACETYPE_DOUBLE: sprintf(prim,"%Ld",*((double*)value)); line += prim; break;
+ case TRACETYPE_DOUBLE: sprintf(prim,"%f" ,*((double*)value)); line += prim; break;
case TRACETYPE_FLOAT: sprintf(prim,"%f" ,*((float *)value)); line += prim; break;
case TRACETYPE_BOOL:
1.30 +0 -1 ws-axis/c/src/common/AxisTrace.h
Index: AxisTrace.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AxisTrace.h 9 Feb 2005 13:24:52 -0000 1.29
+++ AxisTrace.h 10 Feb 2005 13:08:43 -0000 1.30
@@ -63,7 +63,6 @@
#define TRACETYPE_INT 5
#define TRACETYPE_ULONG 6
#define TRACETYPE_LONG 7
-#define TRACETYPE_UDOUBLE 8
#define TRACETYPE_DOUBLE 9
#define TRACETYPE_FLOAT 10
#define TRACETYPE_BOOL 11
1.46 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- BeanParamWriter.java 9 Feb 2005 17:36:59 -0000 1.45
+++ BeanParamWriter.java 10 Feb 2005 13:08:43 -0000 1.46
@@ -330,7 +330,7 @@
writer.write("\tparam->"+attribs[i].getElementNameAsString()+".m_Size = array.m_Size;\n\n");
writer.write("\tif( param->"+attribs[i].getElementNameAsString()+".m_Array == NULL)\n");
writer.write("\t{\n");
- writer.write("\t\tpp"+i+" = ("+attribs[i].getTypeName()+" **) new "+attribs[i].getTypeName()+"*[array.m_Size];\n");
+ writer.write("\t\tpp"+i+" = new "+attribs[i].getTypeName()+"*[array.m_Size];\n");
writer.write("\t\tparam->"+attribs[i].getElementNameAsString()+".m_Array = pp"+i+";\n");
writer.write("\t}\n\n");
writer.write("\t"+attribs[i].getTypeName()+" * p"+i+" = ("+attribs[i].getTypeName()+" *) array.m_Array;\n\n");
@@ -339,7 +339,7 @@
writer.write("\t\tpp"+i+"[iCount"+i+"] = new "+attribs[i].getTypeName()+"();\n");
writer.write("\t\t*(pp"+i+"[iCount"+i+"]) = p"+i+"[iCount"+i+"];\n");
writer.write("\t}\n");
- writer.write("\tdelete p"+i+";\n");
+ writer.write("\tdelete [] p"+i+";\n");
}
else
{
1.6 +0 -1 ws-axis/c/tools/org/apache/axis/tools/trace/Tracer.java
Index: Tracer.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/Tracer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tracer.java 18 Jan 2005 15:02:20 -0000 1.5
+++ Tracer.java 10 Feb 2005 13:08:43 -0000 1.6
@@ -54,7 +54,6 @@
typetable.put("unsigned long", "ULONG");
typetable.put("long", "LONG");
typetable.put("signed long", "LONG");
- typetable.put("unsigned double", "UDOUBLE");
typetable.put("double", "DOUBLE");
typetable.put("float", "FLOAT");
typetable.put("bool", "BOOL");