jcarman     2005/05/03 20:35:20

  Modified:    .        status.xml
               framework/src/java/org/apache/hivemind/impl
                        ServiceImplementationFactoryParametersImpl.java
               framework/src/java/org/apache/hivemind
                        ServiceImplementationFactoryParameters.java
  Added:       framework/src/test/org/apache/hivemind/impl
                        TestServiceImplementationFactoryParametersImpl.java
  Log:
  ServiceImplementationFactoryParameters.getFirstParameter should cope better 
with zero parameters.
  PR: HIVEMIND-105
  
  Revision  Changes    Path
  1.131     +1 -0      jakarta-hivemind/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/status.xml,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- status.xml        4 May 2005 03:24:13 -0000       1.130
  +++ status.xml        4 May 2005 03:35:20 -0000       1.131
  @@ -31,6 +31,7 @@
     </todo>
     <changes>
       <release version="1.1-beta-2" date="unreleased">
  +      <action type="fix" dev="JC" fixes-bug="HIVEMIND-105" 
>ServiceImplementationFactoryParameters.getFirstParameter should cope better 
with zero parameters.</action>
         <action type="fix" dev="JC" fixes-bug="HIVEMIND-101" 
>OrdererMessages.exception uses wrong message key.</action>
         <action type="add" dev="JC" fixes-bug="HIVEMIND-112" >Add 
getServiceIds() Method to Registry Interface.</action>
         <action type="fix" dev="JC" fixes-bug="HIVEMIND-115" >Bean services 
cannot implement RegistryShutdownListener.</action>
  
  
  
  1.1                  
jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestServiceImplementationFactoryParametersImpl.java
  
  Index: TestServiceImplementationFactoryParametersImpl.java
  ===================================================================
  // Copyright 2004, 2005 The Apache Software Foundation
  //
  // Licensed under the Apache License, Version 2.0 (the "License");
  // you may not use this file except in compliance with the License.
  // You may obtain a copy of the License at
  //
  //     http://www.apache.org/licenses/LICENSE-2.0
  //
  // Unless required by applicable law or agreed to in writing, software
  // distributed under the License is distributed on an "AS IS" BASIS,
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  // See the License for the specific language governing permissions and
  // limitations under the License.
  
  package org.apache.hivemind.impl;
  
  import java.util.LinkedList;
  
  import org.apache.hivemind.internal.Module;
  import org.apache.hivemind.internal.ServicePoint;
  import org.apache.hivemind.test.HiveMindTestCase;
  
  /**
   * @author James Carman
   * @version 1.0
   */
  public class TestServiceImplementationFactoryParametersImpl extends 
HiveMindTestCase
  {
      public void testGetFirstParameter()
      {
          final ServicePoint sp = new ServicePointImpl();
          final Module m = new ModuleImpl();
          final ServiceImplementationFactoryParametersImpl params = new 
ServiceImplementationFactoryParametersImpl( sp, m, new LinkedList() );
          assertNull( params.getFirstParameter() );
      }
  
  }
  
  
  
  1.6       +1 -1      
jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java
  
  Index: ServiceImplementationFactoryParametersImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServiceImplementationFactoryParametersImpl.java   29 Apr 2005 07:40:54 
-0000      1.5
  +++ ServiceImplementationFactoryParametersImpl.java   4 May 2005 03:35:20 
-0000       1.6
  @@ -95,6 +95,6 @@
   
       public Object getFirstParameter()
       {
  -        return _parameters.get(0);
  +        return _parameters.isEmpty() ? null : _parameters.get(0);
       }
   }
  \ No newline at end of file
  
  
  
  1.6       +2 -2      
jakarta-hivemind/framework/src/java/org/apache/hivemind/ServiceImplementationFactoryParameters.java
  
  Index: ServiceImplementationFactoryParameters.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ServiceImplementationFactoryParameters.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServiceImplementationFactoryParameters.java       29 Apr 2005 07:40:53 
-0000      1.5
  +++ ServiceImplementationFactoryParameters.java       4 May 2005 03:35:20 
-0000       1.6
  @@ -65,9 +65,9 @@
       
       /**
        * Returns the first parameter passed to the factory (since most 
factories
  -     * take exactly one parameter, this is the most common usage).
  +     * take exactly one parameter, this is the most common usage).  If no 
parameters exist,
  +     * returns null.
        */
  -    
       public Object getFirstParameter();
   
   }
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to