[Castore-commits] Utils.java 1.21 1.22
mathieu grimault
grimault-m at adullact1.hosting.cri74.org
Jeu 7 Déc 10:10:49 CET 2006
Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/common
In directory adullact1:/tmp/cvs-serv25261/src/java/fr/emn/castor/common
Modified Files:
Utils.java
Log Message:
modifs mineures de mise en forme (tentative de dépollution du log par Utils.getRessources)
Index: Utils.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/common/Utils.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Utils.java 6 Dec 2006 09:06:43 -0000 1.21
--- Utils.java 7 Dec 2006 09:10:47 -0000 1.22
***************
*** 134,141 ****
return new FileInputStream(new File(name));
} catch (FileNotFoundException e) {
! if (log.isTraceEnabled()) {
! log.trace(
! "Cannot find ressource under path " + name +
! "\nTrying classloader..."
);
}
--- 134,141 ----
return new FileInputStream(new File(name));
} catch (FileNotFoundException e) {
! if (log.isDebugEnabled()) {
! log.debug(
! "Ressource not found under " +
! name + " Trying classloader..."
);
}
***************
*** 147,152 ****
return resource;
}
! if (log.isErrorEnabled()) {
! log.error("...fail !");
}
return null;
--- 147,152 ----
return resource;
}
! if (log.isDebugEnabled()) {
! log.debug("...fail !");
}
return null;
***************
*** 170,181 ****
}
if (log.isDebugEnabled()) {
! log.debug("Cannot find URL under path " + name);
! log.debug("Trying classloader...");
}
resource = Utils.class.getResource(name);
} catch (MalformedURLException e) {
if (log.isDebugEnabled()) {
! log.debug("Cannot find URL under path " + name);
! log.debug("Trying classloader...");
}
resource = Utils.class.getResource(name);
--- 170,185 ----
}
if (log.isDebugEnabled()) {
! log.debug(
! "URL not found under " + name +
! " Trying classloader..."
! );
}
resource = Utils.class.getResource(name);
} catch (MalformedURLException e) {
if (log.isDebugEnabled()) {
! log.debug(
! "URL not found under " + name +
! " Trying classloader..."
! );
}
resource = Utils.class.getResource(name);
***************
*** 187,192 ****
return resource;
}
! if (log.isErrorEnabled()) {
! log.error("...fail !");
}
return null;
--- 191,196 ----
return resource;
}
! if (log.isDebugEnabled()) {
! log.debug("...fail !");
}
return null;
Plus d'informations sur la liste de diffusion Castore-commits