Author: remy.maucherat(a)jboss.com
Date: 2014-01-10 10:09:14 -0500 (Fri, 10 Jan 2014)
New Revision: 2337
Modified:
branches/7.4.x/src/main/java/org/apache/catalina/session/StoreBase.java
branches/7.4.x/src/main/java/org/apache/catalina/valves/PersistentValve.java
branches/7.4.x/src/main/java/org/jboss/web/CatalinaLogger.java
branches/7.4.x/src/main/java/org/jboss/web/CatalinaMessages.java
branches/7.4.x/src/main/java/org/jboss/web/WebLogger.java
branches/7.4.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java
Log:
Andiamo.
Modified: branches/7.4.x/src/main/java/org/apache/catalina/session/StoreBase.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/session/StoreBase.java 2014-01-10
14:25:54 UTC (rev 2336)
+++ branches/7.4.x/src/main/java/org/apache/catalina/session/StoreBase.java 2014-01-10
15:09:14 UTC (rev 2337)
@@ -178,7 +178,7 @@
try {
keys = keys();
} catch (IOException e) {
- manager.getContainer().getLogger().error("Error getting keys", e);
+ manager.getContainer().getLogger().error(MESSAGES.errorGettingKeys(), e);
return;
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
Modified: branches/7.4.x/src/main/java/org/apache/catalina/valves/PersistentValve.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/catalina/valves/PersistentValve.java 2014-01-10
14:25:54 UTC (rev 2336)
+++
branches/7.4.x/src/main/java/org/apache/catalina/valves/PersistentValve.java 2014-01-10
15:09:14 UTC (rev 2337)
@@ -33,6 +33,7 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.PersistentManager;
+import org.jboss.web.CatalinaLogger;
/**
@@ -115,7 +116,7 @@
try {
session = store.load(sessionId);
} catch (Exception e) {
- container.getLogger().error("deserializeError");
+ CatalinaLogger.VALVES_LOGGER.deserializationError(e);
}
if (session != null) {
if (!session.isValid() ||
Modified: branches/7.4.x/src/main/java/org/jboss/web/CatalinaLogger.java
===================================================================
--- branches/7.4.x/src/main/java/org/jboss/web/CatalinaLogger.java 2014-01-10 14:25:54 UTC
(rev 2336)
+++ branches/7.4.x/src/main/java/org/jboss/web/CatalinaLogger.java 2014-01-10 15:09:14 UTC
(rev 2337)
@@ -689,4 +689,8 @@
@Message(id = 1150, value = "X param in wrong format. Needs to be
'x-#(...)'")
void extendedAccessLogBadXParam();
+ @LogMessage(level = ERROR)
+ @Message(id = 1151, value = "Deserialization error")
+ void deserializationError(@Cause Throwable t);
+
}
Modified: branches/7.4.x/src/main/java/org/jboss/web/CatalinaMessages.java
===================================================================
--- branches/7.4.x/src/main/java/org/jboss/web/CatalinaMessages.java 2014-01-10 14:25:54
UTC (rev 2336)
+++ branches/7.4.x/src/main/java/org/jboss/web/CatalinaMessages.java 2014-01-10 15:09:14
UTC (rev 2337)
@@ -1020,4 +1020,7 @@
@Message(id = 376, value = "Cannot use a read or write listener without
upgrading or starting async")
IllegalStateException cannotSetListenerWithoutUpgradeOrAsync();
+ @Message(id = 377, value = "Error getting keys")
+ String errorGettingKeys();
+
}
Modified: branches/7.4.x/src/main/java/org/jboss/web/WebLogger.java
===================================================================
--- branches/7.4.x/src/main/java/org/jboss/web/WebLogger.java 2014-01-10 14:25:54 UTC (rev
2336)
+++ branches/7.4.x/src/main/java/org/jboss/web/WebLogger.java 2014-01-10 15:09:14 UTC (rev
2337)
@@ -53,4 +53,8 @@
@Message(id = 7502, value = "Invalid PHP library %s.%s.%s, required version is
%s.%s.%s")
void invalidPhpLibrary(int major, int minor, int patch, int requiredMajor, int
requiredMinor, int requiredPatch);
+ @LogMessage(level = ERROR)
+ @Message(id = 7503, value = "Invalid null script names")
+ void invalidScriptNames();
+
}
Modified: branches/7.4.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- branches/7.4.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java 2014-01-10
14:25:54 UTC (rev 2336)
+++ branches/7.4.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java 2014-01-10
15:09:14 UTC (rev 2337)
@@ -36,6 +36,7 @@
import org.apache.catalina.util.IOTools;
import org.jboss.logging.Logger;
+import org.jboss.web.WebLogger;
/**
@@ -48,8 +49,6 @@
*/
public class ScriptEnvironment {
- private static Logger log = Logger.getLogger(ScriptEnvironment.class);
-
/**
* The Request attribute key for the client certificate chain.
*/
@@ -363,7 +362,7 @@
|| sScriptName == null
|| sFullName == null
|| sName == null) {
- log.error("Invalid script names");
+ WebLogger.ROOT_LOGGER.invalidScriptNames();
return false;
}
Show replies by date