[jboss-cvs] Repository SVN: r515 - jacorb.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 31 04:37:28 EDT 2007
Author: dimitris at jboss.org
Date: 2007-05-31 04:37:28 -0400 (Thu, 31 May 2007)
New Revision: 515
Removed:
jacorb/patchfile.from_JacORB_2.3.0_to_JacORB_2_3_0jboss.patch2
Log:
tidy up
Deleted: jacorb/patchfile.from_JacORB_2.3.0_to_JacORB_2_3_0jboss.patch2
===================================================================
--- jacorb/patchfile.from_JacORB_2.3.0_to_JacORB_2_3_0jboss.patch2 2007-05-31 08:37:03 UTC (rev 514)
+++ jacorb/patchfile.from_JacORB_2.3.0_to_JacORB_2_3_0jboss.patch2 2007-05-31 08:37:28 UTC (rev 515)
@@ -1,274 +0,0 @@
-? README
-? Version.patch
-? patchfile
-? lib/jacorb_g.jar.list
-? lib/jacorb_no_g.jar.list
-? lib/saved
-Index: src/org/jacorb/orb/CDRInputStream.java
-===================================================================
-RCS file: /cvsroot/jacorb/JacORB/src/org/jacorb/orb/CDRInputStream.java,v
-retrieving revision 1.114
-retrieving revision 1.115
-diff -u -r1.114 -r1.115
---- src/org/jacorb/orb/CDRInputStream.java 8 Jan 2007 12:18:45 -0000 1.114
-+++ src/org/jacorb/orb/CDRInputStream.java 27 Apr 2007 19:14:06 -0000 1.115
-@@ -50,7 +50,7 @@
- * Read CDR encoded data
- *
- * @author Gerald Brose, FU Berlin
-- * $Id: CDRInputStream.java,v 1.114 2007/01/08 12:18:45 alphonse.bendt Exp $
-+ * $Id: CDRInputStream.java,v 1.115 2007/04/27 19:14:06 francisco Exp $
- */
-
- public class CDRInputStream
-@@ -466,7 +466,7 @@
-
- // tag is an end tag
-
-- if ( ! (-tag <= valueNestingLevel))
-+ if (-tag > valueNestingLevel)
- {
- throw new INTERNAL
- (
-@@ -475,7 +475,7 @@
- valueNestingLevel
- );
- }
-- valueNestingLevel = - tag;
-+ valueNestingLevel = -tag;
- valueNestingLevel--;
-
- if (valueNestingLevel > 0)
-@@ -484,17 +484,17 @@
- handle_chunking();
- }
- }
-- else if (tag < 0x7fffff00)
-+ else if (tag > 0 && tag < 0x7fffff00)
- {
- // tag is the chunk size tag of another chunk
-
- chunk_end_pos = pos + tag;
- }
-- else // (tag >= 0x7fffff00)
-+ else // (tag == 0 || tag >= 0x7fffff00)
- {
-- // tag is the value tag of a nested value
-+ // tag is the null value tag or the value tag of a nested value
-
-- pos = saved_pos; // "unread" the value tag
-+ pos = saved_pos; // "unread" the tag
- index = saved_index;
- }
- }
-@@ -2883,8 +2883,7 @@
- if (chunkedValue || valueNestingLevel > 0)
- {
- valueNestingLevel++;
-- int chunk_size_tag = readChunkSizeTag();
-- chunk_end_pos = pos + chunk_size_tag;
-+ readChunkSizeTag();
- }
-
- for (int i = 0; i < repository_ids.length; i++)
-@@ -3087,7 +3086,7 @@
- * special handling if there's no chunk size
- * in the stream.
- */
-- private int readChunkSizeTag()
-+ private void readChunkSizeTag()
- {
- int savedPos = pos;
- int savedIndex = index;
-@@ -3095,14 +3094,16 @@
-
- if (!sunInteropFix || chunk_size_tag > 0 && chunk_size_tag < MAX_BLOCK_SIZE)
- {
-- // looks like the correct chunk size
-- return chunk_size_tag;
-+ // valid chunk size: set the ending position of the chunk
-+ chunk_end_pos = pos + chunk_size_tag;
-+ }
-+ else
-+ {
-+ // reset buffer and remember that we're not within a chunk
-+ pos = savedPos;
-+ index = savedIndex;
-+ chunk_end_pos = -1;
- }
--
-- // reset buffer
-- pos = savedPos;
-- index = savedIndex;
-- return MAX_BLOCK_SIZE;
- }
-
- /**
-Index: src/org/jacorb/orb/CDROutputStream.java
-===================================================================
-RCS file: /cvsroot/jacorb/JacORB/src/org/jacorb/orb/CDROutputStream.java,v
-retrieving revision 1.122
-retrieving revision 1.123
-diff -u -r1.122 -r1.123
---- src/org/jacorb/orb/CDROutputStream.java 30 Nov 2006 13:11:07 -0000 1.122
-+++ src/org/jacorb/orb/CDROutputStream.java 26 Apr 2007 23:07:26 -0000 1.123
-@@ -47,7 +47,7 @@
-
- /**
- * @author Gerald Brose, 1999
-- * @version $Id: CDROutputStream.java,v 1.122 2006/11/30 13:11:07 alphonse.bendt Exp $
-+ * @version $Id: CDROutputStream.java,v 1.123 2007/04/26 23:07:26 francisco Exp $
- *
- * A stream for CDR marshalling.
- *
-@@ -2480,13 +2480,13 @@
- }
-
- public void write_value(final java.io.Serializable value,
-- final org.omg.CORBA.portable.BoxedValueHelper factory)
-+ final org.omg.CORBA.portable.BoxedValueHelper factory)
- {
- if (!write_special_value (value))
- {
-+ write_previous_chunk_size();
- check(7,4);
- getValueMap().put (value, ObjectUtil.newInteger(pos));
-- write_previous_chunk_size();
- if ((value instanceof org.omg.CORBA.portable.IDLEntity) ||
- (value instanceof java.lang.String))
- {
-@@ -2635,7 +2635,6 @@
- */
- private void write_value_header(final String[] repository_ids)
- {
-- write_previous_chunk_size();
- if (repository_ids != null)
- {
- if( repository_ids.length > 1 )
-@@ -2670,7 +2669,6 @@
- {
- if (codebase != null)
- {
-- write_previous_chunk_size();
- if ( repository_ids != null )
- {
- if( repository_ids.length > 1 )
-@@ -2718,6 +2716,7 @@
- private void write_value_internal(final java.io.Serializable value,
- final String repository_id)
- {
-+ write_previous_chunk_size();
- check(7,4);
- getValueMap().put(value, ObjectUtil.newInteger(pos));
-
-@@ -2930,9 +2929,9 @@
- */
- private void write_previous_chunk_size()
- {
-- if( chunk_size_tag_pos != -1 )
-+ if (chunk_size_tag_pos != -1)
- {
-- if ( pos == chunk_octets_pos)
-+ if (pos == chunk_octets_pos)
- {
- // empty chunk: erase chunk size tag
- pos = chunk_size_tag_pos; // the tag will be overwritten
-Index: src/org/jacorb/security/ssl/sun_jsse/JSSEUtil.java
-===================================================================
-RCS file: /cvsroot/jacorb/JacORB/src/org/jacorb/security/ssl/sun_jsse/JSSEUtil.java,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- src/org/jacorb/security/ssl/sun_jsse/JSSEUtil.java 14 Jun 2006 12:49:22 -0000 1.1
-+++ src/org/jacorb/security/ssl/sun_jsse/JSSEUtil.java 30 May 2007 22:55:28 -0000 1.2
-@@ -33,7 +33,7 @@
- * use the JSSE included with JDK1.4 or standalone version 1.0.x
- *
- * @author Alphonse Bendt
-- * @version $Id: JSSEUtil.java,v 1.1 2006/06/14 12:49:22 alphonse.bendt Exp $
-+ * @version $Id: JSSEUtil.java,v 1.2 2007/05/30 22:55:28 francisco Exp $
- */
- public class JSSEUtil
- {
-@@ -44,8 +44,7 @@
- boolean result;
- try
- {
-- Class clazz = Class.forName("javax.net.ssl.SSLSocket");
-- clazz.getMethod("setEnabledProtocols", new Class[] {String[].class});
-+ SSLSocket.class.getMethod("setEnabledProtocols", new Class[] {String[].class});
- result = true;
- }
- catch(Exception e)
-@@ -57,15 +56,29 @@
-
- public static void setEnabledProtocols(SSLSocket socket, String[] enabledProtocols)
- {
-- _setEnabledProtocols(socket, enabledProtocols);
-- }
-+ if (!isJDK14)
-+ {
-+ // method does not exist in pre JDK 1.4 JSSE
-+ return;
-+ }
-
-- public static void setEnabledProtocols(SSLServerSocket socket, String[] enabledProtocols)
-- {
-- _setEnabledProtocols(socket, enabledProtocols);
-+ try
-+ {
-+ Method method = SSLSocket.class.getMethod("setEnabledProtocols", new Class[] {String[].class});
-+ method.invoke(socket, new Object[] {enabledProtocols});
-+ }
-+ catch (InvocationTargetException e)
-+ {
-+ throw new RuntimeException(e.getTargetException().toString());
-+ }
-+ catch (Exception e)
-+ {
-+ // shouldn't happen on JDK1.4
-+ throw new RuntimeException(e.toString());
-+ }
- }
-
-- private static void _setEnabledProtocols(Object socket, String[] enabledProtocols)
-+ public static void setEnabledProtocols(SSLServerSocket socket, String[] enabledProtocols)
- {
- if (!isJDK14)
- {
-@@ -75,7 +88,7 @@
-
- try
- {
-- Method method = socket.getClass().getMethod("setEnabledProtocols", new Class[] {enabledProtocols.getClass()});
-+ Method method = SSLServerSocket.class.getMethod("setEnabledProtocols", new Class[] {String[].class});
- method.invoke(socket, new Object[] {enabledProtocols});
- }
- catch (InvocationTargetException e)
-@@ -131,7 +144,7 @@
-
- try
- {
-- Method method = s.getClass().getMethod("setWantClientAuth", new Class[] {Boolean.TYPE});
-+ Method method = SSLServerSocket.class.getMethod("setWantClientAuth", new Class[] {Boolean.TYPE});
- method.invoke(s, new Object[] {Boolean.valueOf(request_mutual_auth)});
- }
- catch(Exception e)
-Index: src/org/jacorb/util/Version.java
-===================================================================
-RCS file: /cvsroot/jacorb/JacORB/src/org/jacorb/util/Version.java,v
-retrieving revision 1.36
-diff -u -r1.36 Version.java
---- src/org/jacorb/util/Version.java 17 Feb 2007 18:54:00 -0000 1.36
-+++ src/org/jacorb/util/Version.java 31 May 2007 01:52:21 -0000
-@@ -28,8 +28,8 @@
- */
- public final class Version
- {
-- public static final String version = "2.3.0";
-- public static final String date = "17-Feb-2007";
-+ public static final String version = "2.3.0 (JBoss patch 2)";
-+ public static final String date = "30-May-2007";
- public static final String longVersion = version + ", " + date;
- public static final String yearString = "1997-2007";
- }
More information about the jboss-cvs-commits
mailing list