Changeset 7194


Ignore:
Timestamp:
Aug 30, 2016, 8:40:51 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

References #2027: Improve inter-communication between extensions

Switches search order so that the parent class loader is searched last. Fixed path to Hibernate JAR file.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core/net/sf/basedb/util/JarClassLoader.java

    r7192 r7194  
    241241  }
    242242
     243  @Override
     244  public String toString()
     245  {
     246    return super.toString() + "[" + mainJarFile + "]";
     247  }
     248
    243249  /*
    244250    From the ClassLoader class
     
    369375    }
    370376   
    371     // 5. Delegate to parent class loader if it hasn't been done
    372     if (c == null && !delegateFirst)
    373     {
    374       c = loadClassInternal(parent, name);
    375       if (log.isDebugEnabled()) log.debug("parent class (" + name + "): " + c);
    376     }
    377    
    378     // 6. Side-load from proxied JAR files (eg. other extensions)
     377    // 5. Side-load from proxied JAR files (eg. other extensions)
    379378    Iterator<JarClassLoaderProxy> it = proxyLoaders.iterator();
    380379    while (c == null && it.hasNext())
     
    383382      c = proxyLoader.findClass(name);
    384383      if (log.isDebugEnabled()) log.debug("proxy class (" + proxyLoader.jarPath + "; " + name + "): " + c);
     384    }
     385   
     386    // 6. Delegate to parent class loader if it hasn't been done
     387    if (c == null && !delegateFirst)
     388    {
     389      c = loadClassInternal(parent, name);
     390      if (log.isDebugEnabled()) log.debug("parent class (" + name + "): " + c);
    385391    }
    386392   
  • trunk/src/test/data/JarPluginManifest.txt

    r6970 r7194  
    11Class-Path: ../../lib/dist/AffxFusion.jar
    2  ../../lib/dist/hibernate-core-4.3.9.Final.jar
     2 ../../lib/dist/hibernate-core-5.0.7.Final.jar
Note: See TracChangeset for help on using the changeset viewer.