directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r586755 - in /directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap: gui/ support/ support/extended/
Date Sat, 20 Oct 2007 16:05:24 GMT
Author: elecharny
Date: Sat Oct 20 09:05:23 2007
New Revision: 586755

URL: http://svn.apache.org/viewvc?rev=586755&view=rev
Log:
Removed some warnings

Modified:
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultAddHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultDeleteHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultExtendedHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultModifyHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultUnbindHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
Sat Oct 20 09:05:23 2007
@@ -33,6 +33,7 @@
 
 import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.Request;
 import org.apache.mina.common.IoSession;
 import javax.swing.JTextArea;
 import javax.swing.event.ListSelectionEvent;
@@ -184,7 +185,8 @@
     private void setRequestsModel()
     {
         AbandonableRequest[] requests;
-        Map reqsMap = registry.getOutstandingRequests( session );
+        Map<Integer, Request> reqsMap = registry.getOutstandingRequests( session );
+        
         if ( reqsMap != null )
         {
             requests = new AbandonableRequest[reqsMap.size()];

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
Sat Oct 20 09:05:23 2007
@@ -30,7 +30,7 @@
 {
     final String[] columns = new String[]
         { "messageId", "type" };
-    final Class[] columnClasses = new Class[]
+    final Class<?>[] columnClasses = new Class[]
         { Integer.class, String.class };
     final AbandonableRequest[] requests;
 
@@ -65,7 +65,7 @@
     }
 
 
-    public Class getColumnClass( int columnIndex )
+    public Class<?> getColumnClass( int columnIndex )
     {
         return columnClasses[columnIndex];
     }

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
Sat Oct 20 09:05:23 2007
@@ -32,7 +32,7 @@
 {
     final String[] columns = new String[]
         { "client address", "client port", "server address", "server port" };
-    final Class[] columnClasses = new Class[]
+    final Class<?>[] columnClasses = new Class[]
         { String.class, Integer.class, String.class, Integer.class };
     final IoSession[] sessions;
 
@@ -67,7 +67,7 @@
     }
 
 
-    public Class getColumnClass( int columnIndex )
+    public Class<?> getColumnClass( int columnIndex )
     {
         return columnClasses[columnIndex];
     }

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultAddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultAddHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultAddHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultAddHandler.java
Sat Oct 20 09:05:23 2007
@@ -25,7 +25,6 @@
 import javax.naming.ReferralException;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AddRequest;
 import org.apache.directory.shared.ldap.message.LdapResult;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultDeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultDeleteHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultDeleteHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultDeleteHandler.java
Sat Oct 20 09:05:23 2007
@@ -25,7 +25,6 @@
 import javax.naming.ReferralException;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.DeleteRequest;
 import org.apache.directory.shared.ldap.message.LdapResult;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultExtendedHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultExtendedHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultExtendedHandler.java
Sat Oct 20 09:05:23 2007
@@ -21,7 +21,6 @@
 
 
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
-import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultModifyHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultModifyHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultModifyHandler.java
Sat Oct 20 09:05:23 2007
@@ -25,7 +25,6 @@
 import javax.naming.ReferralException;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ManageDsaITControl;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultSearchHandler.java
Sat Oct 20 09:05:23 2007
@@ -41,6 +41,7 @@
 import javax.naming.NamingException;
 import javax.naming.ReferralException;
 import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
 import java.util.Collection;
 import java.util.Collections;
@@ -106,6 +107,7 @@
         controls.setReturningObjFlag( req.getTypesOnly() );
         controls.setReturningAttributes( ids );
         controls.setDerefLinkFlag( true );
+        
         return controls;
     }
 
@@ -121,10 +123,12 @@
         boolean isBaseIsRoot = req.getBase().isEmpty();
         boolean isBaseScope = req.getScope() == ScopeEnum.BASE_OBJECT;
         boolean isRootDSEFilter = false;
+        
         if ( req.getFilter() instanceof PresenceNode )
         {
             isRootDSEFilter = ( ( PresenceNode ) req.getFilter() ).getAttribute().equalsIgnoreCase(
SchemaConstants.OBJECT_CLASS_AT );
         }
+        
         return isBaseIsRoot && isBaseScope && isRootDSEFilter;
     }
 
@@ -143,7 +147,7 @@
     	}
 
     	ServerLdapContext ctx;
-        NamingEnumeration list = null;
+        NamingEnumeration<SearchResult> list = null;
         String[] ids = null;
         Collection<String> retAttrs = new HashSet<String>();
         retAttrs.addAll( req.getAttributes() );
@@ -239,6 +243,7 @@
             int maxTime = ldapServer.getMaxTimeLimit();
 
             SearchControls controls;
+            
             if ( isAnonymousUser )
             {
                 controls = getSearchControls( req, ids, false, maxSize, maxTime );
@@ -260,6 +265,7 @@
 
             PersistentSearchControl psearchControl = ( PersistentSearchControl ) req.getControls().get(
                 PersistentSearchControl.CONTROL_OID );
+            
             if ( psearchControl != null )
             {
                 // there are no limits for psearch processing
@@ -270,17 +276,21 @@
                 {
                     list = ctx.search( req.getBase(), req.getFilter(),
                         controls );
+                    
                     if ( list instanceof AbandonListener )
                     {
                         req.addAbandonListener( ( AbandonListener ) list );
                     }
+                    
                     if ( list.hasMore() )
                     {
-                        Iterator it = new SearchResponseIterator( req, ctx, list, controls.getSearchScope(),
+                        Iterator<Response> it = new SearchResponseIterator( req, ctx,
list, controls.getSearchScope(),
                                 session, getSessionRegistry() );
+                        
                         while ( it.hasNext() )
                         {
-                            Response resp = ( Response ) it.next();
+                            Response resp = it.next();
+                            
                             if ( resp instanceof SearchResponseDone )
                             {
                                 // ok if normal search beforehand failed somehow quickly
abandon psearch
@@ -296,7 +306,9 @@
                                 // loop and user the notification listener to send back
                                 // notificationss to the client in never ending search
                                 else
+                                {
                                     break;
+                                }
                             }
                             else
                             {
@@ -322,6 +334,7 @@
              * for each search result returned.
              */
             list = ctx.search( req.getBase(), req.getFilter(), controls );
+            
             if ( list instanceof AbandonListener )
             {
                 req.addAbandonListener( ( AbandonListener ) list );
@@ -329,8 +342,9 @@
 
             if ( list.hasMore() )
             {
-                Iterator it = new SearchResponseIterator( req, ctx, list, controls.getSearchScope(),
+                Iterator<Response> it = new SearchResponseIterator( req, ctx, list,
controls.getSearchScope(),
                         session, getSessionRegistry() );
+                
                 while ( it.hasNext() )
                 {
                     session.write( it.next() );
@@ -340,6 +354,7 @@
             {
                 list.close();
                 req.getResultResponse().getLdapResult().setResultCode( ResultCodeEnum.SUCCESS
);
+                
                 for ( ResultResponse resultResponse : Collections.singleton( req.getResultResponse()
) )
                 {
                     session.write( resultResponse );
@@ -353,13 +368,13 @@
             result.setReferral( refs );
             result.setResultCode( ResultCodeEnum.REFERRAL );
             result.setErrorMessage( "Encountered referral attempting to handle add request."
);
-            /* coming up null causing a NPE */
-            // result.setMatchedDn( e.getResolvedName().toString() );
+
             do
             {
                 refs.addLdapUrl( ( String ) e.getReferralInfo() );
             }
             while ( e.skipReferral() );
+            
             session.write( req.getResultResponse() );
             getSessionRegistry().removeOutstandingRequest( session, req.getMessageId() );
         }
@@ -383,12 +398,14 @@
             }
 
             String msg = "failed on search operation: " + e.getMessage();
+            
             if ( LOG.isDebugEnabled() )
             {
                 msg += ":\n" + req + ":\n" + ExceptionUtils.getStackTrace( e );
             }
 
             ResultCodeEnum code;
+            
             if ( e instanceof LdapException )
             {
                 code = ( ( LdapException ) e ).getResultCode();
@@ -413,6 +430,7 @@
             {
                 session.write( resultResponse );
             }
+            
             getSessionRegistry().removeOutstandingRequest( session, req.getMessageId() );
         }
         finally

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultUnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultUnbindHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultUnbindHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DefaultUnbindHandler.java
Sat Oct 20 09:05:23 2007
@@ -21,7 +21,6 @@
 
 
 import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.ldap.SessionRegistry;
 import org.apache.directory.shared.ldap.message.UnbindRequest;
 import org.apache.mina.common.IoSession;
 import org.slf4j.Logger;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
Sat Oct 20 09:05:23 2007
@@ -39,6 +39,7 @@
 import org.apache.directory.shared.ldap.message.ManageDsaITControl;
 import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
+import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchResponseDone;
@@ -62,17 +63,17 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-class SearchResponseIterator implements Iterator
+class SearchResponseIterator implements Iterator<Response>
 {
     private static final Logger LOG = LoggerFactory.getLogger( SearchResponseIterator.class
);
     private final SearchRequest req;
     private final ServerLdapContext ctx;
-    private final NamingEnumeration underlying;
+    private final NamingEnumeration<SearchResult> underlying;
     private final IoSession session;
     private final SessionRegistry registry;
     private SearchResponseDone respDone;
     private boolean done;
-    private Object prefetched;
+    private Response prefetched;
     private final int scope;
 
     /** Speedup for logs */
@@ -90,7 +91,7 @@
      * @param scope the scope of the search
      * @param session the session of the issuer of the search
      */
-    public SearchResponseIterator( SearchRequest req, ServerLdapContext ctx, NamingEnumeration
underlying, int scope,
+    public SearchResponseIterator( SearchRequest req, ServerLdapContext ctx, NamingEnumeration<SearchResult>
underlying, int scope,
         IoSession session, SessionRegistry registry )
     {
         this.req = req;
@@ -182,9 +183,9 @@
     }
 
 
-    public Object next()
+    public Response next()
     {
-        Object next = prefetched;
+        Response next = prefetched;
         
         try
         {
@@ -234,12 +235,12 @@
         try
         {
             /*
-             * If we have more results from the underlying cursorr then
+             * If we have more results from the underlying cursor then
              * we just set the result and build the response object below.
              */
             if ( underlying.hasMore() )
             {
-                result = ( SearchResult ) underlying.next();
+                result = underlying.next();
             }
             else
             {

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
Sat Oct 20 09:05:23 2007
@@ -276,13 +276,14 @@
         }
 
         // And close the connections when the NoDs are sent.
-        Iterator sessionIt = sessions.iterator();
+        Iterator<IoSession> sessionIt = sessions.iterator();
+        
         for ( WriteFuture future : writeFutures )
         {
             try
             {
                 future.join( 1000 );
-                ( ( IoSession ) sessionIt.next() ).close();
+                sessionIt.next().close();
             }
             catch ( Exception e )
             {

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
Sat Oct 20 09:05:23 2007
@@ -96,13 +96,14 @@
             requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId() ) );
 
             PartitionNexus nexus = service.getPartitionNexus();
-            Iterator list = nexus.listSuffixes( new ListSuffixOperationContext() );
+            Iterator<String> list = nexus.listSuffixes( new ListSuffixOperationContext()
);
             int launchedWindowCount = 0;
             
             while ( list.hasNext() )
             {
-                LdapDN dn = new LdapDN( ( String ) list.next() );
+                LdapDN dn = new LdapDN( list.next() );
                 Partition partition = nexus.getPartition( dn );
+                
                 if ( partition instanceof BTreePartition )
                 {
                     BTreePartition btPartition = ( BTreePartition ) partition;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java?rev=586755&r1=586754&r2=586755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
Sat Oct 20 09:05:23 2007
@@ -69,6 +69,7 @@
 {
     private StoredProcExecutionManager manager;
     private static final Object[] EMPTY_CLASS_ARRAY = new Object[0];
+    
     public StoredProcedureExtendedOperationHandler()
     {
         super();
@@ -102,20 +103,24 @@
         Attributes spUnit = manager.findStoredProcUnit( ctx, procedure );
         StoredProcEngine engine = manager.getStoredProcEngineInstance( spUnit );
         
-        List valueList = new ArrayList( spBean.getParameters().size() );
+        List<Object> valueList = new ArrayList<Object>( spBean.getParameters().size()
);
         Iterator<StoredProcedureParameter> it = spBean.getParameters().iterator();
+        
         while ( it.hasNext() )
         {
             StoredProcedureParameter pPojo = it.next();
             byte[] serializedValue = pPojo.getValue();
             Object value = SerializationUtils.deserialize( serializedValue );
+            
             if ( value.getClass().equals( LdapContextParameter.class ) )
             {
                 String paramCtx = ( ( LdapContextParameter ) value ).getValue();
                 value = ctx.lookup( paramCtx );
             }
+            
             valueList.add( value );
         }
+        
         Object[] values = valueList.toArray( EMPTY_CLASS_ARRAY );
         
         Object response = engine.invokeProcedure( ctx, procedure, values );
@@ -153,7 +158,8 @@
     }
 
 
-    private static final Set EXTENSION_OIDS;
+    private static final Set<String> EXTENSION_OIDS;
+    
     static
     {
         Set<String> s = new HashSet<String>();
@@ -163,7 +169,7 @@
     }
     
     
-    public Set getExtensionOids()
+    public Set<String> getExtensionOids()
     {
         return EXTENSION_OIDS;
     }



Mime
View raw message