cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r280541 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl: AbstractValidator.java CachingValidator.java
Date Tue, 13 Sep 2005 11:57:26 GMT
Author: pier
Date: Tue Sep 13 04:57:22 2005
New Revision: 280541

URL: http://svn.apache.org/viewcvs?rev=280541&view=rev
Log:
Fixing logging

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/CachingValidator.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java?rev=280541&r1=280540&r2=280541&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/AbstractValidator.java
Tue Sep 13 04:57:22 2005
@@ -401,10 +401,9 @@
     protected Schema getSchema(SchemaParser parser, Source source, String grammar)
     throws IOException, SAXException {
         if (this.logger.isDebugEnabled()) {
-            String message = "Parsing schema \"" + source.getURI() + "\" using " +
-                             "grammar \"" + grammar + "\" and SourceParser " +
-                             parser.getClass().getName();
-            this.logger.debug(message);
+            this.logger.debug("Parsing schema \"" + source.getURI() + "\" using " +
+                              "grammar \"" + grammar + "\" and SourceParser " +
+                              parser.getClass().getName());
         }
 
         try {

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/CachingValidator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/CachingValidator.java?rev=280541&r1=280540&r2=280541&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/CachingValidator.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/impl/CachingValidator.java
Tue Sep 13 04:57:22 2005
@@ -108,16 +108,15 @@
                 schema = null;
             } else if (validity.isValid() != SourceValidity.VALID) {
                 if (this.logger.isDebugEnabled()) {
-                    this.logger.warn("Cached schema " + uri + " is no longer valid");
+                    this.logger.debug("Cached schema " + uri + " no longer valid");
                 }
                 this.store.remove(key);
                 schema = null;
             } else if (this.logger.isDebugEnabled()) {
-                String m = "Valid cached schema found for " + uri;
-                this.logger.debug(m);
+                this.logger.debug("Valid cached schema found for " + uri);
             }
         } else if (this.logger.isDebugEnabled()) {
-            this.logger.warn("Schema " + uri + " not found in cache");
+            this.logger.debug("Schema " + uri + " not found in cache");
         }
 
         /* If the schema was not cached or was cleared, parse and cache it */
@@ -160,19 +159,17 @@
         if (grammar != null) {
             if (grammar.validity == null) {
                 /* Why did we cache it in the first place? */
-                this.logger.warn("Cached grammar for " + uri + " has null validity");
+                this.logger.warn("Grammar for " + uri + " has null validity");
                 this.store.remove(key);
                 grammar = null;
             } else if (grammar.validity.isValid() != SourceValidity.VALID) {
                 if (this.logger.isDebugEnabled()) {
-                    String m = "Cached grammar for " + uri + " is no longer valid";
-                    this.logger.debug(m);
+                    this.logger.debug("Grammar for " + uri + " no longer valid");
                 }
                 this.store.remove(key);
                 grammar = null;
             } else if (this.logger.isDebugEnabled()) {
-                String m = "Valid cached grammar " + grammar + " for " + uri;
-                this.logger.debug(m);
+                this.logger.debug("Valid cached grammar " + grammar + " for " + uri);
             }
         }
 



Mime
View raw message