[gf-corba-v3-mirror~staging:430] More findbugs fixes.
- From: kcavanaugh@kenai.com
- To: commits@gf-corba-v3-mirror.kenai.com
- Subject: [gf-corba-v3-mirror~staging:430] More findbugs fixes.
- Date: Mon, 25 Jan 2010 22:33:27 +0000
Project: gf-corba-v3-mirror
Repository: staging
Revision: 430
Author: kcavanaugh
Date: 2010-01-25 22:29:11 UTC
Link:
Log Message:
------------
More findbugs fixes.
Revisions:
----------
430
Modified Paths:
---------------
lib/findbugs-1.3.3/bin/findbugs.bat
src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java
src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java
src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java
src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java
src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java
src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java
src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
src/share/classes/com/sun/corba/se/spi/orb/ORB.java
Diffs:
------
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -65,11 +65,11 @@
implements Codec
{
// The ORB that created the factory this codec was created from
- private ORB orb;
- ORBUtilSystemException wrapper;
+ private transient ORB orb;
+ transient ORBUtilSystemException wrapper;
// The GIOP version we are encoding for
- private GIOPVersion giopVersion;
+ private transient GIOPVersion giopVersion;
/*
*******************************************************************
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -765,7 +765,7 @@
// get all the contexts.
NVList nvList = ctx.get_values( "",
CTX_RESTRICT_SCOPE.value,"*" );
String[] context = new String[(nvList.count() * 2) ];
- if( ( nvList != null ) &&( nvList.count() != 0 ) ) {
+ if( nvList.count() != 0 ) {
// The String[] array will contain Name and Value for
each
// context and hence double the size in the array.
int index = 0;
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -56,8 +56,8 @@
implements CodecFactory
{
// The ORB that created this Codec Factory
- private ORB orb;
- private ORBUtilSystemException wrapper ;
+ private transient ORB orb;
+ private transient ORBUtilSystemException wrapper ;
// The maximum minor version of GIOP supported by this codec factory.
// Currently, this is 1.2.
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -92,13 +92,13 @@
private int state = STATE_INITIAL ;
// The ObjectAdapter associated with this IORInfo object.
- private ObjectAdapter adapter;
+ private transient ObjectAdapter adapter;
- private ORB orb ;
+ private transient ORB orb ;
- private ORBUtilSystemException orbutilWrapper ;
- private InterceptorsSystemException wrapper ;
- private OMGSystemException omgWrapper ;
+ private transient ORBUtilSystemException orbutilWrapper ;
+ private transient InterceptorsSystemException wrapper ;
+ private transient OMGSystemException omgWrapper ;
/**
* Creates a new IORInfo implementation. This info object will establish
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -478,7 +478,7 @@
} finally {
// See doc for setPICurrentPushed as to why this is
necessary.
// Check info for null in case errors happen before
initiate.
- if (info != null && info.isPICurrentPushed()) {
+ if (info.isPICurrentPushed()) {
current.popSlotTable( );
// After the pop, original client's TSC slot table
// remains avaiable via PICurrent.
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -71,11 +71,11 @@
implements ORBInitInfo, ORBInitInfoExt
{
// The ORB we are initializing
- private ORB orb;
+ private transient ORB orb;
- private InterceptorsSystemException wrapper ;
- private ORBUtilSystemException orbutilWrapper ;
- private OMGSystemException omgWrapper ;
+ private transient InterceptorsSystemException wrapper ;
+ private transient ORBUtilSystemException orbutilWrapper ;
+ private transient OMGSystemException omgWrapper ;
// The arguments passed to ORB_init
private String[] args;
@@ -160,7 +160,7 @@
*/
public String[] arguments () {
checkStage();
- return args;
+ return args.clone() ;
}
/**
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java
Wed Jan 20 13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -59,9 +59,9 @@
private int slotCounter;
// The ORB associated with this PICurrent object.
- private ORB myORB;
+ private transient ORB myORB;
- private OMGSystemException wrapper ;
+ private transient OMGSystemException wrapper ;
// True if the orb is still initialzing and get_slot and set_slot are not
// to be called.
@@ -69,7 +69,7 @@
// ThreadLocal contains a stack of SlotTable which are used
// for resolve_initial_references( "PICurrent" );
- private ThreadLocal<SlotTableStack> threadLocalSlotTable
+ private transient ThreadLocal<SlotTableStack> threadLocalSlotTable
= new ThreadLocal<SlotTableStack>() {
protected SlotTableStack initialValue( ) {
return new SlotTableStack( myORB, PICurrent.this );
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -207,6 +207,11 @@
// value indicates they are enabled.
// NOTE: The is only currently used on the client side.
public int disableCount = 0;
+
+ // Get FindBugs to shut up about not overridding equals.
+ public boolean equals( Object o ) {
+ return super.equals( o ) ;
+ }
}
public PIHandlerImpl( ORB orb, String[] args ) {
@@ -219,7 +224,7 @@
wrapper =
orb.getLogWrapperTable().get_RPC_PROTOCOL_Interceptors() ;
orbutilWrapper =
orb.getLogWrapperTable().get_RPC_PROTOCOL_ORBUtil() ;
omgWrapper = orb.getLogWrapperTable().get_RPC_PROTOCOL_OMG() ;
- arguments = args ;
+ arguments = args.clone() ;
// Create codec factory:
codecFactory = new CodecFactoryImpl( orb );
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
---
a/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -145,7 +145,7 @@
* Reset the info object so that it can be reused for a retry,
* for example.
*/
- void reset() {
+ synchronized void reset() {
super.reset();
// Please keep these in the same order as declared above.
@@ -308,7 +308,7 @@
// interceptors will not change the resulting byte[] array.
// Otherwise, we would need to make a clone of this array.
- return objectId;
+ return objectId.clone() ;
}
private void checkForNullTemplate()
@@ -322,7 +322,7 @@
}
}
- public String server_id()
+ public synchronized String server_id()
{
checkAccess( MID_SERVER_ID ) ;
checkForNullTemplate() ;
@@ -352,7 +352,7 @@
adapterName = oaid.getAdapterName() ;
}
- return adapterName ;
+ return adapterName.clone() ;
}
/**
@@ -367,7 +367,7 @@
adapterId = oktemp.getAdapterId() ;
}
- return adapterId;
+ return adapterId.clone() ;
}
/**
@@ -551,7 +551,7 @@
// modify the contents of the Parameter[] array. We also assume
// they will not change the values of the containing Anys.
- return cachedArguments;
+ return cachedArguments.clone() ;
}
/**
@@ -671,7 +671,7 @@
// A command encapsulating a request to add a reply service context.
// These commands are enqueued until we have a handle on the actual
// reply service context, at which point they are executed.
- private class AddReplyServiceContextCommand {
+ private static class AddReplyServiceContextCommand {
ServiceContext service_context;
boolean replace;
}
@@ -754,7 +754,7 @@
/**
* Stores the various sources of information used for this info object.
*/
- protected void setInfo( CorbaMessageMediator request, ObjectAdapter oa,
+ protected synchronized void setInfo( CorbaMessageMediator request,
ObjectAdapter oa,
byte[] objectId, ObjectKeyTemplate oktemp )
{
this.request = request;
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
---
a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++
b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -79,12 +79,12 @@
private StubIORImpl ior ;
- public StubIORImpl getIOR()
+ public synchronized StubIORImpl getIOR()
{
return ior ;
}
- public void setIOR( StubIORImpl ior )
+ public synchronized void setIOR( StubIORImpl ior )
{
this.ior = ior ;
}
@@ -97,7 +97,7 @@
/**
* Sets the IOR components if not already set.
*/
- private void init (javax.rmi.CORBA.Stub self)
+ private synchronized void init (javax.rmi.CORBA.Stub self)
{
// If the Stub is not connected to an ORB, BAD_OPERATION exception
// will be raised by the code below.
@@ -164,7 +164,7 @@
return ior.equals( other.ior ) ;
}
- public int hashCode() {
+ public synchronized int hashCode() {
if (ior == null)
return 0 ;
else
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java
Wed Jan 20 13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java
Mon Jan 25 14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -467,10 +467,10 @@
public void deactivate(boolean etherealize_objects, boolean
wait_for_completion)
throws org.omg.PortableServer.POAManagerPackage.AdapterInactive
{
- explicitStateChange = true ;
-
try {
synchronized( this ) {
+ explicitStateChange = true ;
+
if (debug) {
ORBUtility.dprint( this,
"Calling deactivate on POAManager " + this ) ;
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Wed Jan 20
13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Mon Jan 25
14:29:11 2010 -0800
@@ -1461,7 +1461,7 @@
}
// Note that the caller must hold the ORBImpl lock.
- public void checkShutdownState()
+ private void checkShutdownState()
{
if (status == STATUS_DESTROYED) {
throw wrapper.orbDestroyed() ;
@@ -1559,55 +1559,57 @@
super.destroy() ;
- badServerIdHandlerAccessLock = null ;
- clientDelegateFactoryAccessorLock = null ;
- corbaContactInfoListFactoryAccessLock = null ;
- corbaContactInfoListFactoryReadLock = null ;
- corbaContactInfoListFactoryWriteLock = null ;
+ synchronized (this) {
+ badServerIdHandlerAccessLock = null ;
+ clientDelegateFactoryAccessorLock = null ;
+ corbaContactInfoListFactoryAccessLock = null ;
+ corbaContactInfoListFactoryReadLock = null ;
+ corbaContactInfoListFactoryWriteLock = null ;
- objectKeyFactoryAccessLock = null ;
- legacyServerSocketManagerAccessLock = null ;
- threadPoolManagerAccessLock = null ;
- transportManager = null ;
- legacyServerSocketManager = null ;
- OAInvocationInfoStack = null ;
- clientInvocationInfoStack = null ;
- codeBase = null ;
- codeBaseIOR = null ;
- dynamicRequests = null ;
- svResponseReceived = null ;
- runObj = null ;
- shutdownObj = null ;
- waitForCompletionObj = null ;
- invocationObj = null ;
- isProcessingInvocation = null ;
- typeCodeForClassMap = null ;
- valueFactoryCache = null ;
- orbVersionThreadLocal = null ;
- requestDispatcherRegistry = null ;
- copierManager = null ;
- serviceContextFactoryRegistry = null ;
- serviceContextsCache= null ;
- toaFactory = null ;
- poaFactory = null ;
- pihandler = null ;
- configData = null ;
- badServerIdHandler = null ;
- clientDelegateFactory = null ;
- corbaContactInfoListFactory = null ;
- resolver = null ;
- localResolver = null ;
- insNamingDelegate = null ;
- resolverLock = null ;
- urlOperation = null ;
- urlOperationLock = null ;
- taggedComponentFactoryFinder = null ;
- taggedProfileFactoryFinder = null ;
- taggedProfileTemplateFactoryFinder = null ;
- objectKeyFactory = null ;
- invocationInterceptor = null ;
- objectKeyCache = null ;
- objectKeyCacheLock = null ;
+ objectKeyFactoryAccessLock = null ;
+ legacyServerSocketManagerAccessLock = null ;
+ threadPoolManagerAccessLock = null ;
+ transportManager = null ;
+ legacyServerSocketManager = null ;
+ OAInvocationInfoStack = null ;
+ clientInvocationInfoStack = null ;
+ codeBase = null ;
+ codeBaseIOR = null ;
+ dynamicRequests = null ;
+ svResponseReceived = null ;
+ runObj = null ;
+ shutdownObj = null ;
+ waitForCompletionObj = null ;
+ invocationObj = null ;
+ isProcessingInvocation = null ;
+ typeCodeForClassMap = null ;
+ valueFactoryCache = null ;
+ orbVersionThreadLocal = null ;
+ requestDispatcherRegistry = null ;
+ copierManager = null ;
+ serviceContextFactoryRegistry = null ;
+ serviceContextsCache= null ;
+ toaFactory = null ;
+ poaFactory = null ;
+ pihandler = null ;
+ configData = null ;
+ badServerIdHandler = null ;
+ clientDelegateFactory = null ;
+ corbaContactInfoListFactory = null ;
+ resolver = null ;
+ localResolver = null ;
+ insNamingDelegate = null ;
+ resolverLock = null ;
+ urlOperation = null ;
+ urlOperationLock = null ;
+ taggedComponentFactoryFinder = null ;
+ taggedProfileFactoryFinder = null ;
+ taggedProfileTemplateFactoryFinder = null ;
+ objectKeyFactory = null ;
+ invocationInterceptor = null ;
+ objectKeyCache = null ;
+ objectKeyCacheLock = null ;
+ }
try {
mom.close() ;
diff -r f83b16c1ad2c -r bc44718e6b69
src/share/classes/com/sun/corba/se/spi/orb/ORB.java
--- a/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Wed Jan 20
13:33:45 2010 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Mon Jan 25
14:29:11 2010 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2002-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2002-2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -39,7 +39,6 @@
import java.util.Map ;
import java.util.HashMap ;
import java.util.Properties ;
-import java.util.WeakHashMap;
import java.util.logging.Logger ;
@@ -54,18 +53,15 @@
import org.omg.CORBA.portable.ObjectImpl;
import com.sun.corba.se.spi.transport.ByteBufferPool;
-import com.sun.corba.se.spi.transport.CorbaContactInfoList;
import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry ;
import com.sun.corba.se.spi.protocol.ClientDelegateFactory ;
import com.sun.corba.se.spi.protocol.CorbaClientDelegate;
import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher ;
-import com.sun.corba.se.spi.protocol.CorbaMessageMediator ;
import com.sun.corba.se.spi.protocol.PIHandler ;
import com.sun.corba.se.spi.resolver.LocalResolver ;
import com.sun.corba.se.spi.resolver.Resolver ;
import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory ;
-import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo;
import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager;
import com.sun.corba.se.spi.ior.IdentifiableFactoryFinder ;
@@ -77,13 +73,7 @@
import com.sun.corba.se.spi.ior.TaggedProfile ;
import com.sun.corba.se.spi.ior.TaggedProfileTemplate ;
-import com.sun.corba.se.spi.orbutil.closure.Closure ;
-import com.sun.corba.se.spi.orbutil.generic.Pair ;
-import com.sun.corba.se.spi.orbutil.newtimer.TimerManager ;
-import com.sun.corba.se.spi.orb.Operation ;
-import com.sun.corba.se.spi.orb.ORBData ;
-import com.sun.corba.se.spi.orb.ORBVersion ;
import com.sun.corba.se.spi.orbutil.threadpool.ThreadPoolManager;
import com.sun.corba.se.spi.oa.OAInvocationInfo ;
@@ -132,7 +122,6 @@
import com.sun.corba.se.spi.orbutil.ORBClassLoader;
import com.sun.corba.se.spi.orbutil.generic.UnaryFunction;
-import com.sun.corba.se.impl.orbutil.ByteArrayWrapper;
import com.sun.corba.se.spi.protocol.ClientInvocationInfo;
import java.lang.reflect.Field;
@@ -140,7 +129,6 @@
import org.glassfish.gmbal.ManagedObjectManagerFactory ;
import org.glassfish.gmbal.ManagedObject ;
import org.glassfish.gmbal.ManagedData ;
-import org.glassfish.gmbal.Description ;
import org.glassfish.gmbal.InheritedAttributes ;
import org.glassfish.gmbal.InheritedAttribute ;
import org.glassfish.gmbal.ManagedAttribute ;
@@ -300,6 +288,7 @@
private UnaryFunction<String,Class<?>> classNameResolver =
defaultClassNameResolver ;
private ClassCodeBaseHandler ccbHandler = null ;
+ @Override
public synchronized void destroy() {
logWrapperTable = null ;
wrapper = null ;
@@ -311,6 +300,7 @@
}
/** Get the single instance of the PresentationManager
+ * @return The PresentationManager.
*/
@ManagedAttribute
@Description( "The presentation manager, which handles stub creation" )
@@ -322,6 +312,7 @@
/** Get the appropriate StubFactoryFactory. This
* will be dynamic or static depending on whether
* com.sun.corba.se.ORBUseDynamicStub is true or false.
+ * @return The stub factory factory.
*/
public static PresentationManager.StubFactoryFactory
getStubFactoryFactory()
@@ -333,12 +324,14 @@
/** Obtain the InvocationInterceptor for this ORB instance.
* By default this does nothing. XXX this would be a good
* place for the ORB timing system to gather data.
+ * @return The InvocationInterceptor.
*/
public abstract InvocationInterceptor getInvocationInterceptor() ;
/** Set the InvocationInterceptor for this ORB instance.
* This will be used around all dynamic RMI-IIOP calls that
* are mediated by this ORB instance.
+ * @param interceptor The InvocationInterceptor to add.
*/
public abstract void setInvocationInterceptor(
InvocationInterceptor interceptor ) ;
@@ -467,6 +460,7 @@
* always through an exception: either a ForwardException to
* allow another server to handle the request, or else an error
* indication. XXX Remove after ORT for ORBD work is integrated.
+ * @param okey The ObjectKey to check for a valid server id.
*/
public abstract void handleBadServerId( ObjectKey okey ) ;
public abstract void setBadServerIdHandler( BadServerIdHandler handler )
;
@@ -480,8 +474,6 @@
public abstract void createPIHandler() ;
- public abstract void checkShutdownState();
-
// Dispatch support: in the ORB because it is needed for shutdown.
// This is used by the first level server side subcontract.
public abstract boolean isDuringDispatch() ;
@@ -490,6 +482,7 @@
/** Return this ORB's transient server ID. This is needed for
* initializing object adapters.
+ * @return The transient server id.
*/
@ManagedAttribute
@Description( "The transient ServerId of this ORB instance" )
|
[gf-corba-v3-mirror~staging:430] More findbugs fixes. |
kcavanaugh | 01/25/2010 |
