================================================================================
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_5387800_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.27
Report generated at Mon Jul 17 10:51:40 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Mon Jul 17 10:51:40 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5387800_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.27	Fri Jul 14 16:00:31 2006
***************
*** 699,717 ****
  
          URI uri = null;
          try {
-             // attempt to use url.toURI since it will deal with all urls without special characters
-             // and URISyntaxException allows us to catch issues with special characters
-             // this will handle URLs what already have special characters replaced such as URLS
-             // derived from searches for persistence.xml on the Java System class loader
              uri = url.toURI();
          } catch (URISyntaxException e) {
!             try{
!                 // use multi-argument constructor for URI since single-argument constructor and URL.toURI() do not deal with special characters in path
!                 uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), null);
!             } catch (URISyntaxException exc){};
!             if (uri == null){
!                 throw PersistenceUnitLoadingException.exceptionProcessingPersistenceUnit(url, e);
!             }
          }
  
          return uri;
--- 699,707 ----
  
          URI uri = null;
          try {
              uri = url.toURI();
          } catch (URISyntaxException e) {
!             throw PersistenceUnitLoadingException.exceptionProcessingPersistenceUnit(url, e);
          }
  
          return uri;
================================================================================
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_5387800_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.27
Report generated at Mon Jul 17 10:51:57 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Mon Jul 17 10:51:40 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_5387800_060714/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.27	Fri Jul 14 16:00:31 2006
***************
*** 699,717 ****
  
          URI uri = null;
          try {
-             // attempt to use url.toURI since it will deal with all urls without special characters
-             // and URISyntaxException allows us to catch issues with special characters
-             // this will handle URLs what already have special characters replaced such as URLS
-             // derived from searches for persistence.xml on the Java System class loader
              uri = url.toURI();
          } catch (URISyntaxException e) {
!             try{
!                 // use multi-argument constructor for URI since single-argument constructor and URL.toURI() do not deal with special characters in path
!                 uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), null);
!             } catch (URISyntaxException exc){};
!             if (uri == null){
!                 throw PersistenceUnitLoadingException.exceptionProcessingPersistenceUnit(url, e);
!             }
          }
  
          return uri;
--- 699,707 ----
  
          URI uri = null;
          try {
              uri = url.toURI();
          } catch (URISyntaxException e) {
!             throw PersistenceUnitLoadingException.exceptionProcessingPersistenceUnit(url, e);
          }
  
          return uri;