================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5237881_persistence_unit_processing_060713/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.26
Report generated at Thu Jul 13 13:30:41 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Thu Jul 13 13:30:41 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5237881_persistence_unit_processing_060713/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.26	Thu Jul 13 11:35:45 2006
***************
*** 420,426 ****
          Set<String> set = new HashSet();
          
          for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader, true)) {
                  set.add(className);
              }
          }
--- 420,426 ----
          Set<String> set = new HashSet();
          
          for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader)) {
                  set.add(className);
              }
          }
***************
*** 587,593 ****
          List<String> persistentClasses = new Vector<String>();
          List<String> classList = getClassNamesFromDirectory(file);
          for (String className: classList){
!             if (isClassPersistent(className, loader, false)){
                  persistentClasses.add(className);
              }
          }
--- 587,593 ----
          List<String> persistentClasses = new Vector<String>();
          List<String> classList = getClassNamesFromDirectory(file);
          for (String className: classList){
!             if (isClassPersistent(className, loader)){
                  persistentClasses.add(className);
              }
          }
***************
*** 641,647 ****
          }
          List<String> persistentClasses = new Vector();
          for (String className: classList){
!             if (isClassPersistent(className, loader, false)){
                  persistentClasses.add(className);
              }
          }
--- 641,647 ----
          }
          List<String> persistentClasses = new Vector();
          for (String className: classList){
!             if (isClassPersistent(className, loader)){
                  persistentClasses.add(className);
              }
          }
***************
*** 654,672 ****
     * @param className 
     * @return 
     */
!     public static boolean isClassPersistent(String className, ClassLoader loader, boolean throwExceptionIfNotFound){
          Class candidateClass = null;
          try{
              candidateClass = loader.loadClass(className);
!         } catch (ClassNotFoundException exc){
!             if (throwExceptionIfNotFound){
!                 throw PersistenceUnitLoadingException.exceptionLoadingClassWhileLookingForAnnotations(className, exc);
!             } else {
!                 AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", exc.getClass().getName(), exc.getLocalizedMessage() , className);
!                 return false;                
!             }
!         } catch (Exception exception){
!             AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", exception.getClass().getName(), exception.getLocalizedMessage() , className);
              return false;
          }
          return isClassPersistent(candidateClass);
--- 654,667 ----
     * @param className 
     * @return 
     */
!     public static boolean isClassPersistent(String className, ClassLoader loader){
          Class candidateClass = null;
          try{
              candidateClass = loader.loadClass(className);
!         } catch (ClassNotFoundException exc){      
!             throw PersistenceUnitLoadingException.exceptionLoadingClassWhileLookingForAnnotations(className, exc);
!         } catch (Throwable throwable){
!             AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", throwable.getClass().getName(), throwable.getLocalizedMessage() , className);
              return false;
          }
          return isClassPersistent(candidateClass);
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5237881_persistence_unit_processing_060713/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.26
Report generated at Thu Jul 13 13:31:00 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Thu Jul 13 13:30:41 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5237881_persistence_unit_processing_060713/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.26	Thu Jul 13 11:35:45 2006
***************
*** 420,426 ****
          Set<String> set = new HashSet();
          
          for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader, true)) {
                  set.add(className);
              }
          }
--- 420,426 ----
          Set<String> set = new HashSet();
          
          for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader)) {
                  set.add(className);
              }
          }
***************
*** 587,593 ****
          List<String> persistentClasses = new Vector<String>();
          List<String> classList = getClassNamesFromDirectory(file);
          for (String className: classList){
!             if (isClassPersistent(className, loader, false)){
                  persistentClasses.add(className);
              }
          }
--- 587,593 ----
          List<String> persistentClasses = new Vector<String>();
          List<String> classList = getClassNamesFromDirectory(file);
          for (String className: classList){
!             if (isClassPersistent(className, loader)){
                  persistentClasses.add(className);
              }
          }
***************
*** 641,647 ****
          }
          List<String> persistentClasses = new Vector();
          for (String className: classList){
!             if (isClassPersistent(className, loader, false)){
                  persistentClasses.add(className);
              }
          }
--- 641,647 ----
          }
          List<String> persistentClasses = new Vector();
          for (String className: classList){
!             if (isClassPersistent(className, loader)){
                  persistentClasses.add(className);
              }
          }
***************
*** 654,672 ****
     * @param className 
     * @return 
     */
!     public static boolean isClassPersistent(String className, ClassLoader loader, boolean throwExceptionIfNotFound){
          Class candidateClass = null;
          try{
              candidateClass = loader.loadClass(className);
!         } catch (ClassNotFoundException exc){
!             if (throwExceptionIfNotFound){
!                 throw PersistenceUnitLoadingException.exceptionLoadingClassWhileLookingForAnnotations(className, exc);
!             } else {
!                 AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", exc.getClass().getName(), exc.getLocalizedMessage() , className);
!                 return false;                
!             }
!         } catch (Exception exception){
!             AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", exception.getClass().getName(), exception.getLocalizedMessage() , className);
              return false;
          }
          return isClassPersistent(candidateClass);
--- 654,667 ----
     * @param className 
     * @return 
     */
!     public static boolean isClassPersistent(String className, ClassLoader loader){
          Class candidateClass = null;
          try{
              candidateClass = loader.loadClass(className);
!         } catch (ClassNotFoundException exc){      
!             throw PersistenceUnitLoadingException.exceptionLoadingClassWhileLookingForAnnotations(className, exc);
!         } catch (Throwable throwable){
!             AbstractSessionLog.getLog().log(AbstractSessionLog.WARNING, "persistence_unit_processor_error_loading_class", throwable.getClass().getName(), throwable.getLocalizedMessage() , className);
              return false;
          }
          return isClassPersistent(candidateClass);