axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: xml-axis-wsif/java/src/org/apache/wsif/base WSIFDefaultCorrelationService.java
Date Thu, 05 Sep 2002 14:02:23 GMT
whitlock    2002/09/05 07:02:23

  Modified:    java/src/org/apache/wsif/base
                        WSIFDefaultCorrelationService.java
  Log:
  Remove FixedObjectInputStream as it duplicates WSIFObjectInputStream
  
  Revision  Changes    Path
  1.7       +1 -42     xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultCorrelationService.java
  
  Index: WSIFDefaultCorrelationService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultCorrelationService.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WSIFDefaultCorrelationService.java	7 Aug 2002 15:10:25 -0000	1.6
  +++ WSIFDefaultCorrelationService.java	5 Sep 2002 14:02:23 -0000	1.7
  @@ -61,7 +61,6 @@
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.io.ObjectStreamClass;
   import java.io.Serializable;
  @@ -281,48 +280,8 @@
   		} else {
   			ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
   			//ObjectInputStream si = new ObjectInputStream(bais);
  -			FixedObjectInputStream si = new FixedObjectInputStream(bais);
  +			WSIFObjectInputStream si = new WSIFObjectInputStream(bais);
   			return si.readObject();
  -		}
  -	}
  -
  -}
  -
  -/**
  - * ObjectInputStream is broken, see Java Bug Id 4171142.
  - */
  -class FixedObjectInputStream extends ObjectInputStream {
  -	
  -	public FixedObjectInputStream(InputStream is)
  -		throws IOException, StreamCorruptedException {
  -		super(is);
  -	}
  -
  -	public Class resolveClass(ObjectStreamClass desc)
  -		throws ClassNotFoundException, IOException {
  -		try {
  -			return super.resolveClass( desc );
  -		} catch (ClassNotFoundException ex) {
  -			Trc.exception(ex);
  -			if ( desc.getName().equals("int") ) {
  -				return int.class;
  -			} else if ( desc.getName().equals("float") ) {
  -				return float.class;
  -			} else if ( desc.getName().equals("double") ) {
  -				return double.class;
  -			} else if ( desc.getName().equals("boolean") ) {
  -				return boolean.class;
  -			} else if ( desc.getName().equals("long") ) {
  -				return long.class;
  -			} else if ( desc.getName().equals("short") ) {
  -				return short.class;
  -			} else if ( desc.getName().equals("byte") ) {
  -				return byte.class;
  -			} else if ( desc.getName().equals("void") ) {
  -				return void.class;
  -			} else {
  -				throw ex;
  -			}
   		}
   	}
   
  
  
  

Mime
View raw message