You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/08/17 17:08:20 UTC
svn commit: r986353 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
Author: gerdogdu
Date: Tue Aug 17 15:08:20 2010
New Revision: 986353
URL: http://svn.apache.org/viewvc?rev=986353&view=rev
Log:
info --> debug message
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=986353&r1=986352&r2=986353&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java Tue Aug 17 15:08:20 2010
@@ -96,7 +96,11 @@ public class PropertyLoader
Enumeration<URL> propertyUrls = cl.getResources(propertyFileName);
if (propertyUrls == null || !propertyUrls.hasMoreElements())
{
- logger.info("could not find any property files with name " + propertyFileName);
+ if(logger.wblWillLogInfo())
+ {
+ logger.info("could not find any property files with name " + propertyFileName);
+ }
+
return null;
}
@@ -115,7 +119,10 @@ public class PropertyLoader
// a bit debugging output
int ordinal = getConfigurationOrdinal(prop);
- logger.info("loading properties with ordinal " + ordinal + " from file " + propertyUrl.getFile());
+ if(logger.wblWillLogDebug())
+ {
+ logger.debug("loading properties with ordinal " + ordinal + " from file " + propertyUrl.getFile());
+ }
}
finally
{
@@ -196,7 +203,7 @@ public class PropertyLoader
Properties mergedProperties = new Properties();
for (Properties p : sortedProperties)
{
- for (Map.Entry entry : p.entrySet())
+ for (Map.Entry<?,?> entry : p.entrySet())
{
String key = (String) entry.getKey();
String value = (String) entry.getValue();
Re: svn commit: r986353 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
Posted by Mark Struberg <st...@yahoo.de>.
Btw, this reminds me that I sometimes get an Exception in our WebBeansLogger
because 'there is no stack level 4' ...
We need to review our logging some day...
LieGrue,
strub
----- Original Message ----
> From: "gerdogdu@apache.org" <ge...@apache.org>
> To: commits@openwebbeans.apache.org
> Sent: Tue, August 17, 2010 5:08:20 PM
> Subject: svn commit: r986353 -
>/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
>
>
> Author: gerdogdu
> Date: Tue Aug 17 15:08:20 2010
> New Revision: 986353
>
> URL: http://svn.apache.org/viewvc?rev=986353&view=rev
> Log:
> info --> debug message
>
> Modified:
>
>openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
>
>
> Modified:
>openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
>
> URL: :
>http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=986353&r1=986352&r2=986353&view=diff
>
> ==============================================================================
> ---
>openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
> a (original)
> +++
>openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
> Tue Aug 17 15:08:20 2010
> @@ -96,7 +96,11 @@ public class PropertyLoader
> Enumeration<URL> propertyUrls = cl.getResources(propertyFileName);
> if (propertyUrls == null || !propertyUrls.hasMoreElements())
> {
> - logger.info("could not find any property files with name " +
>propertyFileName);
> + if(logger.wblWillLogInfo())
> + {
> + logger.info("could not find any property files with name " +
>propertyFileName);
>
> + }
> +
> return null;
> }
>
> @@ -115,7 +119,10 @@ public class PropertyLoader
>
> // a bit debugging output
> int ordinal = getConfigurationOrdinal(prop);
> - logger.info("loading properties with ordinal " + ordinal + "
>from file " + propertyUrl.getFile());
> + if(logger.wblWillLogDebug())
> + {
> + logger.debug("loading properties with ordinal " +
>ordinal + " from file " + propertyUrl.getFile());
>
> + }
> }
> finally
> {
> @@ -196,7 +203,7 @@ public class PropertyLoader
> Properties mergedProperties = new Properties();
> for (Properties p : sortedProperties)
> {
> - for (Map.Entry entry : p.entrySet())
> + for (Map.Entry<?,?> entry : p.entrySet())
> {
> String key = (String) entry.getKey();
> String value = (String) entry.getValue();
>
>
>