User: user57  
  Date: 02/02/13 00:13:55

  Modified:    src/main/org/jboss/ejb Container.java
  Log:
   o throw IAS when mi is null, since if it is a NPE will be thrown
  
  Revision  Changes    Path
  1.73      +19 -14    jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- Container.java    12 Feb 2002 08:15:35 -0000      1.72
  +++ Container.java    13 Feb 2002 08:13:55 -0000      1.73
  @@ -78,9 +78,8 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
   * @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
  -* @version $Revision: 1.72 $
  -*
  -* <p><b>Revisions:</b>
  +* @version $Revision: 1.73 $
  +** <p><b>Revisions:</b>
   *
   * <p><b>2001/07/26 bill burke:</b>
   * <ul>
  @@ -540,19 +539,25 @@
      }
      
      /**
  -   * Handle a operation invocation.
  -   */
  -   public Object invoke(String actionName, Object[] params, String[] signature)
  +    * Handle a operation invocation.
  +    */
  +   public Object invoke(String ignored, Object[] params, String[] signature)
         throws MBeanException, ReflectionException
      {      
  -      if( params != null && params.length == 1 && (params[0] instanceof Invocation) 
== false )
  -         throw new MBeanException(new IllegalArgumentException("Expected zero or 
single Invocation argument"));
  -
  +      if (params != null && params.length == 1 && (params[0] instanceof Invocation) 
== false) {
  +         log.error("Expected zero or single Invocation argument");
  +         new IllegalArgumentException("Expected zero or single Invocation 
argument");
  +      }
  +      
         Object value = null;
  -      Invocation mi = null;
  -      if( params != null && params.length == 1 )
  -         mi = (Invocation) params[0];
  +      Invocation mi = (Invocation)params[0];
   
  +      // Must have a valid Invocation to continue
  +      if (mi == null) {
  +         log.error("Method invocation object is null");
  +         throw new IllegalArgumentException("Method invocation object is null");
  +      }
  +      
         ClassLoader callerClassLoader = 
Thread.currentThread().getContextClassLoader();
         boolean trace = log.isTraceEnabled();
         try
  @@ -606,7 +611,7 @@
               
               case Invocation.LOCAL:
                  
  -               throw new MBeanException(new UnsupportedOperationException("local is 
not supported yet"));
  +               throw new UnsupportedOperationException("local is not supported 
yet");
                  
               case Invocation.HOME:
                  
  @@ -657,7 +662,7 @@
               
               case Invocation.LOCALHOME:
                  
  -               throw new MBeanException(new 
UnsupportedOperationException("localHome is not supported yet"));
  +               throw new UnsupportedOperationException("localHome is not supported 
yet");
                  
               case Invocation.GETHOME:
                  
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to