[jboss-cvs] JBossAS SVN: r99241 - in trunk/iiop: src/main/java/org/jboss/iiop and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 11 14:43:55 EST 2010
Author: adrian at jboss.org
Date: 2010-01-11 14:43:55 -0500 (Mon, 11 Jan 2010)
New Revision: 99241
Removed:
trunk/iiop/src/main/java/org/jboss/iiop/SunJDK14IsLocalBugFix.java
Modified:
trunk/iiop/.classpath
trunk/iiop/pom.xml
trunk/iiop/src/main/java/org/jboss/iiop/CorbaORBService.java
Log:
[JBAS-7611] - Remove an old JDK14 workaround
Modified: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath 2010-01-11 19:36:47 UTC (rev 99240)
+++ trunk/iiop/.classpath 2010-01-11 19:43:55 UTC (rev 99241)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/iiop/SunJDK14IsLocalBugFix.java" kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" path="target/generated-sources/idl"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-01-11 19:36:47 UTC (rev 99240)
+++ trunk/iiop/pom.xml 2010-01-11 19:43:55 UTC (rev 99241)
@@ -51,15 +51,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jboss/iiop/SunJDK14IsLocalBugFix.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rmic-maven-plugin</artifactId>
<executions>
Modified: trunk/iiop/src/main/java/org/jboss/iiop/CorbaORBService.java
===================================================================
--- trunk/iiop/src/main/java/org/jboss/iiop/CorbaORBService.java 2010-01-11 19:36:47 UTC (rev 99240)
+++ trunk/iiop/src/main/java/org/jboss/iiop/CorbaORBService.java 2010-01-11 19:43:55 UTC (rev 99241)
@@ -82,7 +82,6 @@
private int port = 0;
private int sslPort = 0;
private String sslDomain = null;
- private boolean sunJDK14IsLocalBugFix = false;
// Static --------------------------------------------------------
@@ -219,26 +218,6 @@
if (str != null)
systemProps.put("jacorb.config.log.verbosity", str);
- // This is for SUN JDK bug with isLocal
- if (sunJDK14IsLocalBugFix)
- {
- /* Validate that the class can actually be loaded. It cannot be used
- under java 5 for example because the SunJDK14IsLocalBugFix base class
- does not exist
- */
- try
- {
- Class SunJDK14IsLocalBugFix = cl.loadClass("org.jboss.iiop.SunJDK14IsLocalBugFix");
- log.debug("Was able to load SunJDK14IsLocalBugFix, class="+SunJDK14IsLocalBugFix);
- // Its loadable to use it
- systemProps.put("javax.rmi.CORBA.UtilClass", "org.jboss.iiop.SunJDK14IsLocalBugFix");
- }
- catch(Throwable t)
- {
- log.debug("Ignoring sunJDK14IsLocalBugFix=true due to inability to load org.jboss.iiop.SunJDK14IsLocalBugFix", t);
- }
- }
-
System.setProperties(systemProps);
// Add portable interceptor initializers
@@ -532,12 +511,12 @@
public boolean getSunJDK14IsLocalBugFix()
{
- return sunJDK14IsLocalBugFix;
+ return false;
}
public void setSunJDK14IsLocalBugFix(boolean sunJDK14IsLocalBugFix)
{
- this.sunJDK14IsLocalBugFix = sunJDK14IsLocalBugFix;
+ getLog().warn("Not setting SunJDK14IsLocalBugFix since JDK1.4 is no longer supported.");
}
// ObjectFactory implementation ----------------------------------
Deleted: trunk/iiop/src/main/java/org/jboss/iiop/SunJDK14IsLocalBugFix.java
===================================================================
--- trunk/iiop/src/main/java/org/jboss/iiop/SunJDK14IsLocalBugFix.java 2010-01-11 19:36:47 UTC (rev 99240)
+++ trunk/iiop/src/main/java/org/jboss/iiop/SunJDK14IsLocalBugFix.java 2010-01-11 19:43:55 UTC (rev 99241)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.iiop;
-
-/**
- * There is a bug in Sun's implementation of the method javax.rmi.CORBA.Util.isLocal().
- * Stubs generated with the rmic tool call this method to check is the call is a local invocation,
- * which they can optimize. However, Sun's implementation of isLocal() tries to cast the stub to a proprietary
- * class. This is against the rules. Since the ORB is pluggable ("-Dorg.omg.CORBA.ORBClass=...), Sun's
- * implementation of a standard (javax.rmi) method should not assume that the stubs are Sun stubs.
- *
- * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
- * @version $Revision$
- *
- **/
-public class SunJDK14IsLocalBugFix extends com.sun.corba.se.internal.iiop.ShutdownUtilDelegate
-{
- public boolean isLocal(javax.rmi.CORBA.Stub stub)
- throws java.rmi.RemoteException
- {
- try
- {
- org.omg.CORBA.portable.Delegate delegate = stub._get_delegate();
- return delegate.is_local(stub);
- }
- catch (org.omg.CORBA.SystemException e)
- {
- throw javax.rmi.CORBA.Util.mapSystemException(e);
- }
- }
-}
More information about the jboss-cvs-commits
mailing list