You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/07/20 23:03:47 UTC
svn commit: r558142 - in
/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee:
AbstractConfig.java JNDIConfig.java
Author: jukka
Date: Fri Jul 20 14:03:46 2007
New Revision: 558142
URL: http://svn.apache.org/viewvc?view=rev&rev=558142
Log:
JCR-1033: Committed patch from Ed Burnette.
Modified:
jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java?view=diff&rev=558142&r1=558141&r2=558142
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java Fri Jul 20 14:03:46 2007
@@ -63,9 +63,9 @@
}
public void init(ServletConfig ctx) throws ServletException {
- Enumeration enum = ctx.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ Enumeration names = ctx.getInitParameterNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
String mapName = toMapName(name, '-');
try {
if (map.containsKey(mapName)) {
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java?view=diff&rev=558142&r1=558141&r2=558142
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JNDIConfig.java Fri Jul 20 14:03:46 2007
@@ -91,9 +91,9 @@
public void init(ServletConfig ctx) throws ServletException {
super.init(ctx);
// add all params whose name starts with 'java.namming.' to the env
- Enumeration enum = ctx.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ Enumeration names = ctx.getInitParameterNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
if (name.startsWith("java.naming.")) {
jndiEnv.put(name, ctx.getInitParameter(name));
}