rpms/jacorb/devel jacorb-gcj41.patch,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jacorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9675

Modified Files:
	jacorb-gcj41.patch 
Log Message:
...still looking good...

jacorb-gcj41.patch:
 etc/common.xml                        |    5 ++++-
 idl/omg/PortableServer.idl            |    2 +-
 src/org/jacorb/notification/build.xml |   12 ------------
 src/org/jacorb/poa/POA.java           |   13 ++++++++++---
 4 files changed, 15 insertions(+), 17 deletions(-)

Index: jacorb-gcj41.patch
===================================================================
RCS file: /cvs/dist/rpms/jacorb/devel/jacorb-gcj41.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jacorb-gcj41.patch	16 Dec 2005 10:15:50 -0000	1.3
+++ jacorb-gcj41.patch	16 Dec 2005 10:37:46 -0000	1.4
@@ -53,7 +53,7 @@
  		raises (WrongAdapter, WrongPolicy);
 --- JacORB_2_2/src/org/jacorb/poa/POA.java~	2004-05-06 13:40:00.000000000 +0100
 +++ JacORB_2_2/src/org/jacorb/poa/POA.java	2005-12-16 10:15:12.000000000 +0000
-@@ -1551,7 +1551,7 @@
+@@ -1551,10 +1551,17 @@
      }
  
      public Servant reference_to_servant(org.omg.CORBA.Object reference)
@@ -61,8 +61,19 @@
 +        throws ObjectNotActive, WrongPolicy
      {
          checkDestructionApparent();
-         checkNotLocal(reference);
-@@ -1567,7 +1567,7 @@
+-        checkNotLocal(reference);
++        try
++        {
++            checkNotLocal(reference);
++        }
++        catch (WrongAdapter e)
++        {
++            throw new RuntimeException(e);
++        }
+ 
+         if (!isRetain() && !isUseDefaultServant())
+             throw new WrongPolicy();
+@@ -1567,7 +1574,7 @@
              if (logger.isWarnEnabled())
                  logger.warn(logPrefix + "oid: " + POAUtil.convert(objectId) +
                              "reference_to_servant: oid not previously generated!");