/[classpath]/classpath/java/io/ObjectInputStream.java
ViewVC logotype

Diff of /classpath/java/io/ObjectInputStream.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55 by mkoch, Sat Apr 16 11:05:07 2005 UTC revision 1.56 by mark, Sat Apr 30 13:53:30 2005 UTC
# Line 783  public class ObjectInputStream extends I Line 783  public class ObjectInputStream extends I
783    }    }
784    
785    /**    /**
786     * This method invokes the method currentClassLoader for the     * Returns he most recent user defined ClassLoader on the execution stack
787     * current security manager (or build an empty one if it is not     * or null of none is found.
    * present).  
    *  
    * @return The most recent non-system ClassLoader on the execution stack.  
    * @see java.lang.SecurityManager#currentClassLoader()  
788     */     */
789    private ClassLoader currentLoader()    private ClassLoader currentLoader()
790    {    {
791      SecurityManager sm = System.getSecurityManager();      return VMObjectInputStream.currentClassLoader();
     if (sm == null)  
       sm = new SecurityManager () {};  
       
     return VMObjectInputStream.currentClassLoader(sm);  
792    }    }
793    
794    /**    /**
# Line 883  public class ObjectInputStream extends I Line 875  public class ObjectInputStream extends I
875    protected Class resolveProxyClass(String[] intfs)    protected Class resolveProxyClass(String[] intfs)
876      throws IOException, ClassNotFoundException      throws IOException, ClassNotFoundException
877    {    {
878      SecurityManager sm = System.getSecurityManager();      ClassLoader cl = currentLoader();
       
     if (sm == null)  
       sm = new SecurityManager() {};  
       
     ClassLoader cl = VMObjectInputStream.currentClassLoader(sm);  
879            
880      Class[] clss = new Class[intfs.length];      Class[] clss = new Class[intfs.length];
881      if(cl == null)      if(cl == null)

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26