JBossWeb SVN: r768 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-03 14:48:04 -0400 (Wed, 03 Sep 2008)
New Revision: 768
Modified:
trunk/java/org/apache/naming/resources/ResourceAttributes.java
trunk/webapps/docs/changelog.xml
Log:
- Refactor getETag.
Modified: trunk/java/org/apache/naming/resources/ResourceAttributes.java
===================================================================
--- trunk/java/org/apache/naming/resources/ResourceAttributes.java 2008-09-03 17:51:03 UTC (rev 767)
+++ trunk/java/org/apache/naming/resources/ResourceAttributes.java 2008-09-03 18:48:04 UTC (rev 768)
@@ -718,29 +718,29 @@
* @return ETag
*/
public String getETag(boolean strong) {
- String result = null;
- if (attributes != null) {
- Attribute attribute = attributes.get(ETAG);
- if (attribute != null) {
- try {
- result = attribute.get().toString();
- } catch (NamingException e) {
- ; // No value for the attribute
+ if (strong) {
+ // The strong ETag must always be calculated by the resources
+ if (strongETag != null)
+ return strongETag;
+ if (attributes != null) {
+ Attribute attribute = attributes.get(ETAG);
+ if (attribute != null) {
+ try {
+ strongETag = attribute.get().toString();
+ } catch (NamingException e) {
+ ; // No value for the attribute
+ }
}
}
- }
- if (strong) {
- // The strong ETag must always be calculated by the resources
- result = strongETag;
+ return strongETag;
} else {
// The weakETag is contentLenght + lastModified
if (weakETag == null) {
weakETag = "W/\"" + getContentLength() + "-"
+ getLastModified() + "\"";
}
- result = weakETag;
+ return weakETag;
}
- return result;
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-03 17:51:03 UTC (rev 767)
+++ trunk/webapps/docs/changelog.xml 2008-09-03 18:48:04 UTC (rev 768)
@@ -24,8 +24,11 @@
and harmonize lifecycle checks of StandardPipeline with the other components. (remm)
</fix>
<fix>
- <bug>45628</bug>: JARs without deps should always be fulfilled. (markt)
+ <bug>45628</bug>: JARs without dependencies should always be fulfilled. (markt)
</fix>
+ <fix>
+ <bug>45735</bug>: More consistent getETag. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
16 years, 3 months
JBossWeb SVN: r767 - branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/src/share/classes/org/apache/coyote/http11.
by jbossweb-commits＠lists.jboss.org
Author: mmillson
Date: 2008-09-03 13:51:03 -0400 (Wed, 03 Sep 2008)
New Revision: 767
Modified:
branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/src/share/classes/org/apache/coyote/http11/Http11Protocol.java
Log:
Add socketBuffer attribute to HTTP connector for [JBPAPP-1160].
Modified: branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/src/share/classes/org/apache/coyote/http11/Http11Protocol.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2008-09-03 16:41:57 UTC (rev 766)
+++ branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2008-09-03 17:51:03 UTC (rev 767)
@@ -262,7 +262,10 @@
public int getProcessorCache() { return this.processorCache; }
public void setProcessorCache(int processorCache) { this.processorCache = processorCache; }
- // *
+ protected int socketBuffer = 9000;
+ public int getSocketBuffer() { return socketBuffer; }
+ public void setSocketBuffer(int socketBuffer) { this.socketBuffer = socketBuffer; }
+
/**
* This field indicates if the protocol is secure from the perspective of
* the client (= https is used).
@@ -625,6 +628,7 @@
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
processor.setRestrictedUserAgents(proto.restrictedUserAgents);
+ processor.setSocketBuffer(proto.socketBuffer);
processor.setMaxSavePostSize(proto.maxSavePostSize);
processor.setServer(proto.server);
register(processor);
16 years, 3 months
JBossWeb SVN: r766 - trunk/native/connector/src.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-03 12:41:57 -0400 (Wed, 03 Sep 2008)
New Revision: 766
Modified:
trunk/native/connector/src/address.c
Log:
- Port patch: fixes crash.
Modified: trunk/native/connector/src/address.c
===================================================================
--- trunk/native/connector/src/address.c 2008-09-03 15:17:51 UTC (rev 765)
+++ trunk/native/connector/src/address.c 2008-09-03 16:41:57 UTC (rev 766)
@@ -48,7 +48,7 @@
#if APR_HAVE_IPV6
if (hostname == NULL) {
/* Try all address using IPV6 one */
- while (sl) {
+ while (sl && sl->next) {
if (sl->family == APR_INET6)
break; /* Done */
sl = sl->next;
16 years, 3 months
JBossWeb SVN: r765 - branches.
by jbossweb-commits＠lists.jboss.org
Author: mmillson
Date: 2008-09-03 11:17:51 -0400 (Wed, 03 Sep 2008)
New Revision: 765
Added:
branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160/
Log:
Create JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160 patch branch from JBOSSWEB_2_0_0_GA_CP01 tag
Copied: branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-1160 (from rev 764, tags/JBOSSWEB_2_0_0_GA_CP01)
16 years, 3 months
JBossWeb SVN: r764 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-03 07:40:19 -0400 (Wed, 03 Sep 2008)
New Revision: 764
Modified:
trunk/java/org/apache/catalina/util/ManifestResource.java
trunk/webapps/docs/changelog.xml
Log:
- Port patch for manifest checking.
Modified: trunk/java/org/apache/catalina/util/ManifestResource.java
===================================================================
--- trunk/java/org/apache/catalina/util/ManifestResource.java 2008-09-02 15:42:10 UTC (rev 763)
+++ trunk/java/org/apache/catalina/util/ManifestResource.java 2008-09-03 11:40:19 UTC (rev 764)
@@ -117,7 +117,7 @@
*/
public boolean isFulfilled() {
if (requiredExtensions == null) {
- return false;
+ return true;
}
Iterator it = requiredExtensions.iterator();
while (it.hasNext()) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-02 15:42:10 UTC (rev 763)
+++ trunk/webapps/docs/changelog.xml 2008-09-03 11:40:19 UTC (rev 764)
@@ -21,13 +21,23 @@
<changelog>
<fix>
<jboss-jira>JBAS-5917</jboss-jira>: Fix error handling starting one of the core components,
- and harmonize lifecycle checks of StandardPipeline zith the other components. (remm)
+ and harmonize lifecycle checks of StandardPipeline with the other components. (remm)
</fix>
+ <fix>
+ <bug>45628</bug>: JARs without deps should always be fulfilled. (markt)
+ </fix>
</changelog>
</subsection>
- <subsection name="Jasper">
+ <subsection name="Coyote">
<changelog>
<fix>
+ Fix a rare problem identifying AJP body packets that should be dropped. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
Sync with EL from Tomcat, to fix a number of complex expressions. (remm)
</fix>
<fix>
16 years, 3 months
JBossWeb SVN: r763 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-02 11:42:10 -0400 (Tue, 02 Sep 2008)
New Revision: 763
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/java/org/apache/catalina/core/StandardPipeline.java
trunk/webapps/docs/changelog.xml
Log:
- Improve exception handling if an exception occurs starting a component like the loader (where the context would
remain in a bad state).
- Clear out lifecycle exceptions from StandardPipeline.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2008-09-01 11:37:39 UTC (rev 762)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2008-09-02 15:42:10 UTC (rev 763)
@@ -4238,8 +4238,6 @@
// Binding thread
ClassLoader oldCCL = bindThread();
- boolean mainOk = false;
-
try {
if (ok) {
@@ -4294,12 +4292,7 @@
Manager contextManager = null;
if (manager == null) {
if ( (getCluster() != null) && distributable) {
- try {
- contextManager = getCluster().createManager(getName());
- } catch (Exception ex) {
- log.error("standardContext.clusterFail", ex);
- ok = false;
- }
+ contextManager = getCluster().createManager(getName());
} else {
contextManager = new StandardManager();
}
@@ -4316,22 +4309,18 @@
getCluster().registerManager(manager);
}
- mainOk = true;
-
}
+ } catch (Throwable t) {
+ // This can happen in rare cases with custom components
+ ok = false;
+ log.error(sm.getString("standardContext.startFailed", getName()), t);
} finally {
// Unbinding thread
unbindThread(oldCCL);
- if (!mainOk) {
- // An exception occurred
- // Register with JMX anyway, to allow management
- registerJMX();
- }
}
if (!getConfigured()) {
- log.error( "Error getConfigured");
ok = false;
}
Modified: trunk/java/org/apache/catalina/core/StandardPipeline.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardPipeline.java 2008-09-01 11:37:39 UTC (rev 762)
+++ trunk/java/org/apache/catalina/core/StandardPipeline.java 2008-09-02 15:42:10 UTC (rev 763)
@@ -214,9 +214,11 @@
public synchronized void start() throws LifecycleException {
// Validate and update our current component state
- if (started)
- throw new LifecycleException
- (sm.getString("standardPipeline.alreadyStarted"));
+ if (started) {
+ if(log.isDebugEnabled())
+ log.debug(sm.getString("standardPipeline.alreadyStarted"));
+ return;
+ }
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null);
@@ -253,9 +255,11 @@
public synchronized void stop() throws LifecycleException {
// Validate and update our current component state
- if (!started)
- throw new LifecycleException
- (sm.getString("standardPipeline.notStarted"));
+ if (!started) {
+ if(log.isDebugEnabled())
+ log.debug(sm.getString("standardPipeline.notStarted"));
+ return;
+ }
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-01 11:37:39 UTC (rev 762)
+++ trunk/webapps/docs/changelog.xml 2008-09-02 15:42:10 UTC (rev 763)
@@ -17,9 +17,17 @@
<body>
<section name="JBoss Web 2.1.1.CR7 (remm)">
- <subsection name="Jasper">
+ <subsection name="Catalina">
<changelog>
<fix>
+ <jboss-jira>JBAS-5917</jboss-jira>: Fix error handling starting one of the core components,
+ and harmonize lifecycle checks of StandardPipeline zith the other components. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
Sync with EL from Tomcat, to fix a number of complex expressions. (remm)
</fix>
<fix>
16 years, 3 months
JBossWeb SVN: r762 - trunk/java/org/apache/jasper/runtime.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-01 07:37:39 -0400 (Mon, 01 Sep 2008)
New Revision: 762
Modified:
trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
Log:
- 45666: loop on include.
Modified: trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
===================================================================
--- trunk/java/org/apache/jasper/runtime/JspContextWrapper.java 2008-09-01 11:36:53 UTC (rev 761)
+++ trunk/java/org/apache/jasper/runtime/JspContextWrapper.java 2008-09-01 11:37:39 UTC (rev 762)
@@ -276,7 +276,7 @@
public void include(String relativeUrlPath, boolean flush)
throws ServletException, IOException {
- include(relativeUrlPath, false); // XXX
+ invokingJspCtxt.include(relativeUrlPath, false); // XXX
}
public VariableResolver getVariableResolver() {
16 years, 3 months
JBossWeb SVN: r761 - trunk/java/org/apache/jasper/compiler.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-01 07:36:53 -0400 (Mon, 01 Sep 2008)
New Revision: 761
Modified:
trunk/java/org/apache/jasper/compiler/Compiler.java
trunk/java/org/apache/jasper/compiler/JspUtil.java
trunk/java/org/apache/jasper/compiler/Node.java
trunk/java/org/apache/jasper/compiler/TagPluginManager.java
Log:
- 45691: Duplicate variables.
Modified: trunk/java/org/apache/jasper/compiler/Compiler.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Compiler.java 2008-09-01 11:36:23 UTC (rev 760)
+++ trunk/java/org/apache/jasper/compiler/Compiler.java 2008-09-01 11:36:53 UTC (rev 761)
@@ -146,9 +146,6 @@
ServletWriter writer = null;
try {
- // Reset the temporary variable counter for the generator.
- JspUtil.resetTemporaryVariableName();
-
// Parse the file
ParserController parserCtl = new ParserController(ctxt, this);
pageNodes = parserCtl.parse(ctxt.getJspFile());
Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JspUtil.java 2008-09-01 11:36:23 UTC (rev 760)
+++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2008-09-01 11:36:53 UTC (rev 761)
@@ -59,8 +59,6 @@
private static final String OPEN_EXPR_XML = "%=";
private static final String CLOSE_EXPR_XML = "%";
- private static int tempSequenceNumber = 0;
-
//private static ExpressionEvaluatorImpl expressionEvaluator
//= new ExpressionEvaluatorImpl();
@@ -607,22 +605,6 @@
// }
}
- /**
- * Resets the temporary variable name.
- * (not thread-safe)
- */
- public static void resetTemporaryVariableName() {
- tempSequenceNumber = 0;
- }
-
- /**
- * Generates a new temporary variable name.
- * (not thread-safe)
- */
- public static String nextTemporaryVariableName() {
- return Constants.TEMP_VARIABLE_NAME_PREFIX + (tempSequenceNumber++);
- }
-
public static String coerceToPrimitiveBoolean(String s,
boolean isNamedAttribute) {
if (isNamedAttribute) {
Modified: trunk/java/org/apache/jasper/compiler/Node.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Node.java 2008-09-01 11:36:23 UTC (rev 760)
+++ trunk/java/org/apache/jasper/compiler/Node.java 2008-09-01 11:36:53 UTC (rev 761)
@@ -17,10 +17,10 @@
package org.apache.jasper.compiler;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.ArrayList;
import javax.el.ELContext;
import javax.el.ELException;
@@ -39,6 +39,7 @@
import javax.servlet.jsp.tagext.TryCatchFinally;
import javax.servlet.jsp.tagext.VariableInfo;
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.tagplugin.TagPluginContext;
import org.xml.sax.Attributes;
@@ -470,6 +471,11 @@
private boolean isBomPresent;
/*
+ * Sequence number for temporary variables.
+ */
+ private int tempSequenceNumber = 0;
+
+ /*
* Constructor.
*/
Root(Mark start, Node parent, boolean isXmlSyntax) {
@@ -548,6 +554,18 @@
public Root getParentRoot() {
return parentRoot;
}
+
+ /**
+ * Generates a new temporary variable name.
+ */
+ public String nextTemporaryVariableName() {
+ if (parentRoot == null) {
+ return Constants.TEMP_VARIABLE_NAME_PREFIX + (tempSequenceNumber++);
+ } else {
+ return parentRoot.nextTemporaryVariableName();
+ }
+
+ }
}
/**
@@ -1866,7 +1884,7 @@
super(qName, ATTRIBUTE_ACTION, attrs, nonTaglibXmlnsAttrs,
taglibAttrs, start, parent);
- temporaryVariableName = JspUtil.nextTemporaryVariableName();
+ temporaryVariableName = getRoot().nextTemporaryVariableName();
if ("false".equals(this.getAttributeValue("trim"))) {
// (if null or true, leave default of true)
trim = false;
Modified: trunk/java/org/apache/jasper/compiler/TagPluginManager.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/TagPluginManager.java 2008-09-01 11:36:23 UTC (rev 760)
+++ trunk/java/org/apache/jasper/compiler/TagPluginManager.java 2008-09-01 11:36:53 UTC (rev 761)
@@ -191,7 +191,7 @@
}
public String getTemporaryVariableName() {
- return JspUtil.nextTemporaryVariableName();
+ return node.getRoot().nextTemporaryVariableName();
}
public void generateImport(String imp) {
16 years, 3 months
JBossWeb SVN: r760 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-09-01 07:36:23 -0400 (Mon, 01 Sep 2008)
New Revision: 760
Modified:
trunk/java/org/apache/el/parser/ELParser.java
trunk/java/org/apache/el/parser/ELParser.jjt
trunk/java/org/apache/el/parser/ELParserConstants.java
trunk/java/org/apache/el/parser/ELParserTokenManager.java
trunk/webapps/docs/changelog.xml
Log:
- Remerge EL again.
Modified: trunk/java/org/apache/el/parser/ELParser.java
===================================================================
--- trunk/java/org/apache/el/parser/ELParser.java 2008-09-01 07:36:39 UTC (rev 759)
+++ trunk/java/org/apache/el/parser/ELParser.java 2008-09-01 11:36:23 UTC (rev 760)
@@ -963,7 +963,6 @@
case NULL:
case LPAREN:
case IDENTIFIER:
- case NAMESPACE:
Value();
break;
default:
@@ -1033,7 +1032,6 @@
break;
case LPAREN:
case IDENTIFIER:
- case NAMESPACE:
NonLiteral();
break;
default:
@@ -1131,7 +1129,7 @@
break;
default:
jj_la1[28] = jj_gen;
- if (jj_2_1(3)) {
+ if (jj_2_1(2147483647)) {
Function();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1180,8 +1178,9 @@
Token t1 = null;
try {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case NAMESPACE:
- t0 = jj_consume_token(NAMESPACE);
+ case IDENTIFIER:
+ t0 = jj_consume_token(IDENTIFIER);
+ jj_consume_token(COLON);
break;
default:
jj_la1[30] = jj_gen;
@@ -1189,7 +1188,7 @@
}
t1 = jj_consume_token(IDENTIFIER);
if (t0 != null) {
- jjtn000.setPrefix(t0.image.substring(0, t0.image.length() - 1));
+ jjtn000.setPrefix(t0.image);
jjtn000.setLocalName(t1.image);
} else {
jjtn000.setLocalName(t1.image);
@@ -1208,7 +1207,6 @@
case EMPTY:
case MINUS:
case IDENTIFIER:
- case NAMESPACE:
Expression();
label_10:
while (true) {
@@ -1405,245 +1403,20 @@
}
final private boolean jj_3R_11() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(54)) jj_scanpos = xsp;
if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(LPAREN)) return true;
- xsp = jj_scanpos;
- if (jj_3R_12()) jj_scanpos = xsp;
- if (jj_scan_token(RPAREN)) return true;
+ if (jj_scan_token(COLON)) return true;
return false;
}
- final private boolean jj_3R_20() {
- if (jj_3R_21()) return true;
- return false;
- }
-
- final private boolean jj_3R_44() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
- }
-
- final private boolean jj_3R_19() {
- if (jj_3R_20()) return true;
- return false;
- }
-
- final private boolean jj_3R_38() {
- if (jj_3R_44()) return true;
- return false;
- }
-
final private boolean jj_3_1() {
- if (jj_3R_11()) return true;
- return false;
- }
-
- final private boolean jj_3R_31() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_37()) {
- jj_scanpos = xsp;
- if (jj_3_1()) {
- jj_scanpos = xsp;
- if (jj_3R_38()) return true;
- }
- }
- return false;
- }
-
- final private boolean jj_3R_37() {
+ if (jj_3R_11()) jj_scanpos = xsp;
+ if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- final private boolean jj_3R_43() {
- if (jj_scan_token(NULL)) return true;
- return false;
- }
-
- final private boolean jj_3R_42() {
- if (jj_scan_token(STRING_LITERAL)) return true;
- return false;
- }
-
- final private boolean jj_3R_18() {
- if (jj_3R_19()) return true;
- return false;
- }
-
- final private boolean jj_3R_41() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
- return false;
- }
-
- final private boolean jj_3R_17() {
- if (jj_3R_18()) return true;
- return false;
- }
-
- final private boolean jj_3R_40() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
- return false;
- }
-
- final private boolean jj_3R_29() {
- if (jj_3R_31()) return true;
- return false;
- }
-
- final private boolean jj_3R_46() {
- if (jj_scan_token(FALSE)) return true;
- return false;
- }
-
- final private boolean jj_3R_16() {
- if (jj_3R_17()) return true;
- return false;
- }
-
- final private boolean jj_3R_27() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_28()) {
- jj_scanpos = xsp;
- if (jj_3R_29()) return true;
- }
- return false;
- }
-
- final private boolean jj_3R_28() {
- if (jj_3R_30()) return true;
- return false;
- }
-
- final private boolean jj_3R_45() {
- if (jj_scan_token(TRUE)) return true;
- return false;
- }
-
- final private boolean jj_3R_39() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_45()) {
- jj_scanpos = xsp;
- if (jj_3R_46()) return true;
- }
- return false;
- }
-
- final private boolean jj_3R_15() {
- if (jj_3R_16()) return true;
- return false;
- }
-
- final private boolean jj_3R_26() {
- if (jj_3R_27()) return true;
- return false;
- }
-
- final private boolean jj_3R_25() {
- if (jj_3R_26()) return true;
- return false;
- }
-
- final private boolean jj_3R_36() {
- if (jj_3R_43()) return true;
- return false;
- }
-
- final private boolean jj_3R_35() {
- if (jj_3R_42()) return true;
- return false;
- }
-
- final private boolean jj_3R_24() {
- if (jj_scan_token(EMPTY)) return true;
- return false;
- }
-
- final private boolean jj_3R_34() {
- if (jj_3R_41()) return true;
- return false;
- }
-
- final private boolean jj_3R_33() {
- if (jj_3R_40()) return true;
- return false;
- }
-
- final private boolean jj_3R_23() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(37)) {
- jj_scanpos = xsp;
- if (jj_scan_token(38)) return true;
- }
- return false;
- }
-
- final private boolean jj_3R_12() {
- if (jj_3R_13()) return true;
- return false;
- }
-
- final private boolean jj_3R_22() {
- if (jj_scan_token(MINUS)) return true;
- return false;
- }
-
- final private boolean jj_3R_21() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_22()) {
- jj_scanpos = xsp;
- if (jj_3R_23()) {
- jj_scanpos = xsp;
- if (jj_3R_24()) {
- jj_scanpos = xsp;
- if (jj_3R_25()) return true;
- }
- }
- }
- return false;
- }
-
- final private boolean jj_3R_30() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_32()) {
- jj_scanpos = xsp;
- if (jj_3R_33()) {
- jj_scanpos = xsp;
- if (jj_3R_34()) {
- jj_scanpos = xsp;
- if (jj_3R_35()) {
- jj_scanpos = xsp;
- if (jj_3R_36()) return true;
- }
- }
- }
- }
- return false;
- }
-
- final private boolean jj_3R_32() {
- if (jj_3R_39()) return true;
- return false;
- }
-
- final private boolean jj_3R_14() {
- if (jj_3R_15()) return true;
- return false;
- }
-
- final private boolean jj_3R_13() {
- if (jj_3R_14()) return true;
- return false;
- }
-
public ELParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
@@ -1664,7 +1437,7 @@
jj_la1_0 = new int[] {0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x240000,0x9d600,0x240000,0x80000,0x0,0x0,0x1000000,0x9d600,0x1d600,0xc000,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x10000,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x608860,0x0,0x600000,0x0,0x0,0x200000,0x400000,0x0,0x608860,0x0,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x10000,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x208860,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x208860,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
@@ -1844,8 +1617,8 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[60];
- for (int i = 0; i < 60; i++) {
+ boolean[] la1tokens = new boolean[59];
+ for (int i = 0; i < 59; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -1864,7 +1637,7 @@
}
}
}
- for (int i = 0; i < 60; i++) {
+ for (int i = 0; i < 59; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified: trunk/java/org/apache/el/parser/ELParser.jjt
===================================================================
--- trunk/java/org/apache/el/parser/ELParser.jjt 2008-09-01 07:36:39 UTC (rev 759)
+++ trunk/java/org/apache/el/parser/ELParser.jjt 2008-09-01 11:36:23 UTC (rev 760)
@@ -16,22 +16,22 @@
*/
/*
- Author: Jacob Hookom
- Email: jacob at hookom.net
+ Author: Jacob Hookom
+ Email: jacob at hookom.net
*/
/* == Option Declaration == */
options
{
- STATIC=false;
- NODE_PREFIX="Ast";
- VISITOR_EXCEPTION="javax.el.ELException";
- VISITOR=false;
- MULTI=true;
- NODE_DEFAULT_VOID=true;
- JAVA_UNICODE_ESCAPE=false;
- UNICODE_INPUT=true;
- BUILD_NODE_FILES=true;
+ STATIC=false;
+ NODE_PREFIX="Ast";
+ VISITOR_EXCEPTION="javax.el.ELException";
+ VISITOR=false;
+ MULTI=true;
+ NODE_DEFAULT_VOID=true;
+ JAVA_UNICODE_ESCAPE=false;
+ UNICODE_INPUT=true;
+ BUILD_NODE_FILES=true;
}
/* == Parser Declaration == */
@@ -44,9 +44,9 @@
public static Node parse(String ref) throws ELException
{
try {
- return (new ELParser(new StringReader(ref))).CompositeExpression();
+ return (new ELParser(new StringReader(ref))).CompositeExpression();
} catch (ParseException pe) {
- throw new ELException(pe.getMessage());
+ throw new ELException(pe.getMessage());
}
}
}
@@ -59,7 +59,7 @@
*/
AstCompositeExpression CompositeExpression() #CompositeExpression : {}
{
- (DeferredExpression() | DynamicExpression() | LiteralExpression())* <EOF> { return jjtThis; }
+ (DeferredExpression() | DynamicExpression() | LiteralExpression())* <EOF> { return jjtThis; }
}
/*
@@ -68,7 +68,7 @@
*/
void LiteralExpression() #LiteralExpression : { Token t = null; }
{
- t=<LITERAL_EXPRESSION> { jjtThis.setImage(t.image); }
+ t=<LITERAL_EXPRESSION> { jjtThis.setImage(t.image); }
}
/*
@@ -77,7 +77,7 @@
*/
void DeferredExpression() #DeferredExpression : {}
{
- <START_DEFERRED_EXPRESSION> Expression() <END_EXPRESSION>
+ <START_DEFERRED_EXPRESSION> Expression() <END_EXPRESSION>
}
/*
@@ -86,7 +86,7 @@
*/
void DynamicExpression() #DynamicExpression : {}
{
- <START_DYNAMIC_EXPRESSION> Expression() <END_EXPRESSION>
+ <START_DYNAMIC_EXPRESSION> Expression() <END_EXPRESSION>
}
/*
@@ -95,7 +95,7 @@
*/
void Expression() : {}
{
- Choice()
+ Choice()
}
/*
@@ -104,7 +104,7 @@
*/
void Choice() : {}
{
- Or() (<QUESTIONMARK> Choice() <COLON> Choice() #Choice(3))*
+ Or() (<QUESTIONMARK> Choice() <COLON> Choice() #Choice(3))*
}
/*
@@ -113,7 +113,7 @@
*/
void Or() : {}
{
- And() ((<OR0>|<OR1>) And() #Or(2))*
+ And() ((<OR0>|<OR1>) And() #Or(2))*
}
/*
@@ -122,7 +122,7 @@
*/
void And() : {}
{
- Equality() ((<AND0>|<AND1>) Equality() #And(2))*
+ Equality() ((<AND0>|<AND1>) Equality() #And(2))*
}
/*
@@ -131,12 +131,12 @@
*/
void Equality() : {}
{
- Compare()
- (
- ((<EQ0>|<EQ1>) Compare() #Equal(2))
- |
- ((<NE0>|<NE1>) Compare() #NotEqual(2))
- )*
+ Compare()
+ (
+ ((<EQ0>|<EQ1>) Compare() #Equal(2))
+ |
+ ((<NE0>|<NE1>) Compare() #NotEqual(2))
+ )*
}
/*
@@ -145,16 +145,16 @@
*/
void Compare() : {}
{
- Math()
- (
- ((<LT0>|<LT1>) Math() #LessThan(2))
- |
- ((<GT0>|<GT1>) Math() #GreaterThan(2))
- |
- ((<LE0>|<LE1>) Math() #LessThanEqual(2))
- |
- ((<GE0>|<GE1>) Math() #GreaterThanEqual(2))
- )*
+ Math()
+ (
+ ((<LT0>|<LT1>) Math() #LessThan(2))
+ |
+ ((<GT0>|<GT1>) Math() #GreaterThan(2))
+ |
+ ((<LE0>|<LE1>) Math() #LessThanEqual(2))
+ |
+ ((<GE0>|<GE1>) Math() #GreaterThanEqual(2))
+ )*
}
/*
@@ -163,12 +163,12 @@
*/
void Math() : {}
{
- Multiplication()
- (
- (<PLUS> Multiplication() #Plus(2))
- |
- (<MINUS> Multiplication() #Minus(2))
- )*
+ Multiplication()
+ (
+ (<PLUS> Multiplication() #Plus(2))
+ |
+ (<MINUS> Multiplication() #Minus(2))
+ )*
}
/*
@@ -177,14 +177,14 @@
*/
void Multiplication() : {}
{
- Unary()
- (
- (<MULT> Unary() #Mult(2))
- |
- ((<DIV0>|<DIV1>) Unary() #Div(2))
- |
- ((<MOD0>|<MOD1>) Unary() #Mod(2))
- )*
+ Unary()
+ (
+ (<MULT> Unary() #Mult(2))
+ |
+ ((<DIV0>|<DIV1>) Unary() #Div(2))
+ |
+ ((<MOD0>|<MOD1>) Unary() #Mod(2))
+ )*
}
/*
@@ -193,13 +193,13 @@
*/
void Unary() : {}
{
- <MINUS> Unary() #Negative
- |
- (<NOT0>|<NOT1>) Unary() #Not
- |
- <EMPTY> Unary() #Empty
- |
- Value()
+ <MINUS> Unary() #Negative
+ |
+ (<NOT0>|<NOT1>) Unary() #Not
+ |
+ <EMPTY> Unary() #Empty
+ |
+ Value()
}
/*
@@ -208,7 +208,7 @@
*/
void Value() : {}
{
- (ValuePrefix() (ValueSuffix())*) #Value(>1)
+ (ValuePrefix() (ValueSuffix())*) #Value(>1)
}
/*
@@ -217,8 +217,8 @@
*/
void ValuePrefix() : {}
{
- Literal()
- | NonLiteral()
+ Literal()
+ | NonLiteral()
}
/*
@@ -227,7 +227,7 @@
*/
void ValueSuffix() : {}
{
- DotSuffix() | BracketSuffix()
+ DotSuffix() | BracketSuffix()
}
/*
@@ -236,7 +236,7 @@
*/
void DotSuffix() #DotSuffix : { Token t = null; }
{
- <DOT> t=<IDENTIFIER> { jjtThis.setImage(t.image); }
+ <DOT> t=<IDENTIFIER> { jjtThis.setImage(t.image); }
}
/*
@@ -245,7 +245,7 @@
*/
void BracketSuffix() #BracketSuffix : {}
{
- <LBRACK> Expression() <RBRACK>
+ <LBRACK> Expression() <RBRACK>
}
/*
@@ -254,9 +254,9 @@
*/
void NonLiteral() : {}
{
- <LPAREN> Expression() <RPAREN>
- | LOOKAHEAD(3) Function()
- | Identifier()
+ <LPAREN> Expression() <RPAREN>
+ | LOOKAHEAD((<IDENTIFIER> <COLON>)? <IDENTIFIER> <LPAREN>) Function()
+ | Identifier()
}
/*
@@ -265,7 +265,7 @@
*/
void Identifier() #Identifier : { Token t = null; }
{
- t=<IDENTIFIER> { jjtThis.setImage(t.image); }
+ t=<IDENTIFIER> { jjtThis.setImage(t.image); }
}
/*
@@ -274,20 +274,20 @@
*/
void Function() #Function :
{
- Token t0 = null;
- Token t1 = null;
+ Token t0 = null;
+ Token t1 = null;
}
{
- (t0=<NAMESPACE>)? t1=<IDENTIFIER>
- {
- if (t0 != null) {
- jjtThis.setPrefix(t0.image.substring(0, t0.image.length() - 1));
- jjtThis.setLocalName(t1.image);
- } else {
- jjtThis.setLocalName(t1.image);
- }
- }
- <LPAREN> (Expression() (<COMMA> Expression())*)? <RPAREN>
+ (t0=<IDENTIFIER> <COLON>)? t1=<IDENTIFIER>
+ {
+ if (t0 != null) {
+ jjtThis.setPrefix(t0.image);
+ jjtThis.setLocalName(t1.image);
+ } else {
+ jjtThis.setLocalName(t1.image);
+ }
+ }
+ <LPAREN> (Expression() (<COMMA> Expression())*)? <RPAREN>
}
/*
@@ -296,11 +296,11 @@
*/
void Literal() : {}
{
- Boolean()
- | FloatingPoint()
- | Integer()
- | String()
- | Null()
+ Boolean()
+ | FloatingPoint()
+ | Integer()
+ | String()
+ | Null()
}
/*
@@ -309,8 +309,8 @@
*/
void Boolean() : {}
{
- <TRUE> #True
- | <FALSE> #False
+ <TRUE> #True
+ | <FALSE> #False
}
/*
@@ -319,7 +319,7 @@
*/
void FloatingPoint() #FloatingPoint : { Token t = null; }
{
- t=<FLOATING_POINT_LITERAL> { jjtThis.setImage(t.image); }
+ t=<FLOATING_POINT_LITERAL> { jjtThis.setImage(t.image); }
}
/*
@@ -328,7 +328,7 @@
*/
void Integer() #Integer : { Token t = null; }
{
- t=<INTEGER_LITERAL> { jjtThis.setImage(t.image); }
+ t=<INTEGER_LITERAL> { jjtThis.setImage(t.image); }
}
/*
@@ -337,7 +337,7 @@
*/
void String() #String : { Token t = null; }
{
- t=<STRING_LITERAL> { jjtThis.setImage(t.image); }
+ t=<STRING_LITERAL> { jjtThis.setImage(t.image); }
}
/*
@@ -346,7 +346,7 @@
*/
void Null() #Null : {}
{
- <NULL>
+ <NULL>
}
@@ -374,98 +374,97 @@
<IN_EXPRESSION> TOKEN :
{
- < INTEGER_LITERAL: ["0"-"9"] (["0"-"9"])* >
-| < FLOATING_POINT_LITERAL: (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)?
- | "." (["0"-"9"])+ (<EXPONENT>)?
- | (["0"-"9"])+ <EXPONENT>
- >
-| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
-| < STRING_LITERAL: ("\"" ((~["\"","\\"])
- | ("\\" ( ["\\","\""] )))* "\"")
- | ("\'" ((~["\'","\\"])
- | ("\\" ( ["\\","\'"] )))* "\'")
- >
-| < BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" ( ~["\\","\""] )))
- | ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))
- >
-| < TRUE : "true" >
-| < FALSE : "false" >
-| < NULL : "null" >
-| < END_EXPRESSION : "}" > : DEFAULT
-| < DOT : "." >
-| < LPAREN : "(" >
-| < RPAREN : ")" >
-| < LBRACK : "[" >
-| < RBRACK : "]" >
-| < COLON : ":" >
-| < COMMA : "," >
-| < GT0 : ">" >
-| < GT1 : "gt" >
-| < LT0 : "<" >
-| < LT1 : "lt" >
-| < GE0 : ">=" >
-| < GE1 : "ge" >
-| < LE0 : "<=" >
-| < LE1 : "le" >
-| < EQ0 : "==" >
-| < EQ1 : "eq" >
-| < NE0 : "!=" >
-| < NE1 : "ne" >
-| < NOT0 : "!" >
-| < NOT1 : "not" >
-| < AND0 : "&&" >
-| < AND1 : "and" >
-| < OR0 : "||" >
-| < OR1 : "or" >
-| < EMPTY : "empty" >
-| < INSTANCEOF : "instanceof" >
-| < MULT : "*" >
-| < PLUS : "+" >
-| < MINUS : "-" >
-| < QUESTIONMARK : "?" >
-| < DIV0 : "/" >
-| < DIV1 : "div" >
-| < MOD0 : "%" >
-| < MOD1 : "mod" >
-| < IDENTIFIER : (<LETTER>|<IMPL_OBJ_START>) (<LETTER>|<DIGIT>)* >
-| < NAMESPACE : (<IDENTIFIER> (<IDENTIFIER>|<MINUS>|<DOT>)* <COLON>) >
-| < FUNCTIONSUFFIX : (<IDENTIFIER>) >
-| < #IMPL_OBJ_START: "#" >
-| < #LETTER:
- [
- "\u0024",
- "\u0041"-"\u005a",
- "\u005f",
- "\u0061"-"\u007a",
- "\u00c0"-"\u00d6",
- "\u00d8"-"\u00f6",
- "\u00f8"-"\u00ff",
- "\u0100"-"\u1fff",
- "\u3040"-"\u318f",
- "\u3300"-"\u337f",
- "\u3400"-"\u3d2d",
- "\u4e00"-"\u9fff",
- "\uf900"-"\ufaff"
- ]
- >
-| < #DIGIT:
- [
- "\u0030"-"\u0039",
- "\u0660"-"\u0669",
- "\u06f0"-"\u06f9",
- "\u0966"-"\u096f",
- "\u09e6"-"\u09ef",
- "\u0a66"-"\u0a6f",
- "\u0ae6"-"\u0aef",
- "\u0b66"-"\u0b6f",
- "\u0be7"-"\u0bef",
- "\u0c66"-"\u0c6f",
- "\u0ce6"-"\u0cef",
- "\u0d66"-"\u0d6f",
- "\u0e50"-"\u0e59",
- "\u0ed0"-"\u0ed9",
- "\u1040"-"\u1049"
- ]
- >
-| < ILLEGAL_CHARACTER: (~[]) >
+ < INTEGER_LITERAL: ["0"-"9"] (["0"-"9"])* >
+| < FLOATING_POINT_LITERAL: (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)?
+ | "." (["0"-"9"])+ (<EXPONENT>)?
+ | (["0"-"9"])+ <EXPONENT>
+ >
+| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
+| < STRING_LITERAL: ("\"" ((~["\"","\\"])
+ | ("\\" ( ["\\","\""] )))* "\"")
+ | ("\'" ((~["\'","\\"])
+ | ("\\" ( ["\\","\'"] )))* "\'")
+ >
+| < BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" ( ~["\\","\""] )))
+ | ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))
+ >
+| < TRUE : "true" >
+| < FALSE : "false" >
+| < NULL : "null" >
+| < END_EXPRESSION : "}" > : DEFAULT
+| < DOT : "." >
+| < LPAREN : "(" >
+| < RPAREN : ")" >
+| < LBRACK : "[" >
+| < RBRACK : "]" >
+| < COLON : ":" >
+| < COMMA : "," >
+| < GT0 : ">" >
+| < GT1 : "gt" >
+| < LT0 : "<" >
+| < LT1 : "lt" >
+| < GE0 : ">=" >
+| < GE1 : "ge" >
+| < LE0 : "<=" >
+| < LE1 : "le" >
+| < EQ0 : "==" >
+| < EQ1 : "eq" >
+| < NE0 : "!=" >
+| < NE1 : "ne" >
+| < NOT0 : "!" >
+| < NOT1 : "not" >
+| < AND0 : "&&" >
+| < AND1 : "and" >
+| < OR0 : "||" >
+| < OR1 : "or" >
+| < EMPTY : "empty" >
+| < INSTANCEOF : "instanceof" >
+| < MULT : "*" >
+| < PLUS : "+" >
+| < MINUS : "-" >
+| < QUESTIONMARK : "?" >
+| < DIV0 : "/" >
+| < DIV1 : "div" >
+| < MOD0 : "%" >
+| < MOD1 : "mod" >
+| < IDENTIFIER : (<LETTER>|<IMPL_OBJ_START>) (<LETTER>|<DIGIT>)* >
+| < FUNCTIONSUFFIX : (<IDENTIFIER>) >
+| < #IMPL_OBJ_START: "#" >
+| < #LETTER:
+ [
+ "\u0024",
+ "\u0041"-"\u005a",
+ "\u005f",
+ "\u0061"-"\u007a",
+ "\u00c0"-"\u00d6",
+ "\u00d8"-"\u00f6",
+ "\u00f8"-"\u00ff",
+ "\u0100"-"\u1fff",
+ "\u3040"-"\u318f",
+ "\u3300"-"\u337f",
+ "\u3400"-"\u3d2d",
+ "\u4e00"-"\u9fff",
+ "\uf900"-"\ufaff"
+ ]
+ >
+| < #DIGIT:
+ [
+ "\u0030"-"\u0039",
+ "\u0660"-"\u0669",
+ "\u06f0"-"\u06f9",
+ "\u0966"-"\u096f",
+ "\u09e6"-"\u09ef",
+ "\u0a66"-"\u0a6f",
+ "\u0ae6"-"\u0aef",
+ "\u0b66"-"\u0b6f",
+ "\u0be7"-"\u0bef",
+ "\u0c66"-"\u0c6f",
+ "\u0ce6"-"\u0cef",
+ "\u0d66"-"\u0d6f",
+ "\u0e50"-"\u0e59",
+ "\u0ed0"-"\u0ed9",
+ "\u1040"-"\u1049"
+ ]
+ >
+| < ILLEGAL_CHARACTER: (~[]) >
}
Modified: trunk/java/org/apache/el/parser/ELParserConstants.java
===================================================================
--- trunk/java/org/apache/el/parser/ELParserConstants.java 2008-09-01 07:36:39 UTC (rev 759)
+++ trunk/java/org/apache/el/parser/ELParserConstants.java 2008-09-01 11:36:23 UTC (rev 760)
@@ -68,12 +68,11 @@
int MOD0 = 51;
int MOD1 = 52;
int IDENTIFIER = 53;
- int NAMESPACE = 54;
- int FUNCTIONSUFFIX = 55;
- int IMPL_OBJ_START = 56;
- int LETTER = 57;
- int DIGIT = 58;
- int ILLEGAL_CHARACTER = 59;
+ int FUNCTIONSUFFIX = 54;
+ int IMPL_OBJ_START = 55;
+ int LETTER = 56;
+ int DIGIT = 57;
+ int ILLEGAL_CHARACTER = 58;
int DEFAULT = 0;
int IN_EXPRESSION = 1;
@@ -133,7 +132,6 @@
"\"%\"",
"\"mod\"",
"<IDENTIFIER>",
- "<NAMESPACE>",
"<FUNCTIONSUFFIX>",
"\"#\"",
"<LETTER>",
Modified: trunk/java/org/apache/el/parser/ELParserTokenManager.java
===================================================================
--- trunk/java/org/apache/el/parser/ELParserTokenManager.java 2008-09-01 07:36:39 UTC (rev 759)
+++ trunk/java/org/apache/el/parser/ELParserTokenManager.java 2008-09-01 11:36:23 UTC (rev 760)
@@ -299,52 +299,52 @@
switch (pos)
{
case 0:
+ if ((active0 & 0x40000L) != 0L)
+ return 1;
if ((active0 & 0x141d555401c000L) != 0L)
{
jjmatchedKind = 53;
- return 41;
+ return 36;
}
- if ((active0 & 0x40000L) != 0L)
- return 1;
return -1;
case 1:
if ((active0 & 0x41554000000L) != 0L)
- return 42;
+ return 36;
if ((active0 & 0x1419400001c000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 1;
- return 42;
+ return 36;
}
return -1;
case 2:
- if ((active0 & 0x14014000000000L) != 0L)
- return 42;
if ((active0 & 0x18000001c000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 2;
- return 42;
+ return 36;
}
+ if ((active0 & 0x14014000000000L) != 0L)
+ return 36;
return -1;
case 3:
if ((active0 & 0x14000L) != 0L)
- return 42;
+ return 36;
if ((active0 & 0x180000008000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 3;
- return 42;
+ return 36;
}
return -1;
case 4:
if ((active0 & 0x80000008000L) != 0L)
- return 42;
+ return 36;
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 4;
- return 42;
+ return 36;
}
return -1;
case 5:
@@ -352,7 +352,7 @@
{
jjmatchedKind = 53;
jjmatchedPos = 5;
- return 42;
+ return 36;
}
return -1;
case 6:
@@ -360,7 +360,7 @@
{
jjmatchedKind = 53;
jjmatchedPos = 6;
- return 42;
+ return 36;
}
return -1;
case 7:
@@ -368,7 +368,7 @@
{
jjmatchedKind = 53;
jjmatchedPos = 7;
- return 42;
+ return 36;
}
return -1;
case 8:
@@ -376,7 +376,7 @@
{
jjmatchedKind = 53;
jjmatchedPos = 8;
- return 42;
+ return 36;
}
return -1;
default :
@@ -495,11 +495,11 @@
return jjMoveStringLiteralDfa2_1(active0, 0x8000L);
case 101:
if ((active0 & 0x40000000L) != 0L)
- return jjStartNfaWithStates_1(1, 30, 42);
+ return jjStartNfaWithStates_1(1, 30, 36);
else if ((active0 & 0x100000000L) != 0L)
- return jjStartNfaWithStates_1(1, 32, 42);
+ return jjStartNfaWithStates_1(1, 32, 36);
else if ((active0 & 0x1000000000L) != 0L)
- return jjStartNfaWithStates_1(1, 36, 42);
+ return jjStartNfaWithStates_1(1, 36, 36);
break;
case 105:
return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L);
@@ -511,17 +511,17 @@
return jjMoveStringLiteralDfa2_1(active0, 0x10004000000000L);
case 113:
if ((active0 & 0x400000000L) != 0L)
- return jjStartNfaWithStates_1(1, 34, 42);
+ return jjStartNfaWithStates_1(1, 34, 36);
break;
case 114:
if ((active0 & 0x40000000000L) != 0L)
- return jjStartNfaWithStates_1(1, 42, 42);
+ return jjStartNfaWithStates_1(1, 42, 36);
return jjMoveStringLiteralDfa2_1(active0, 0x4000L);
case 116:
if ((active0 & 0x4000000L) != 0L)
- return jjStartNfaWithStates_1(1, 26, 42);
+ return jjStartNfaWithStates_1(1, 26, 36);
else if ((active0 & 0x10000000L) != 0L)
- return jjStartNfaWithStates_1(1, 28, 42);
+ return jjStartNfaWithStates_1(1, 28, 36);
break;
case 117:
return jjMoveStringLiteralDfa2_1(active0, 0x10000L);
@@ -547,9 +547,9 @@
{
case 100:
if ((active0 & 0x10000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 40, 42);
+ return jjStartNfaWithStates_1(2, 40, 36);
else if ((active0 & 0x10000000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 52, 42);
+ return jjStartNfaWithStates_1(2, 52, 36);
break;
case 108:
return jjMoveStringLiteralDfa3_1(active0, 0x18000L);
@@ -559,13 +559,13 @@
return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L);
case 116:
if ((active0 & 0x4000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 38, 42);
+ return jjStartNfaWithStates_1(2, 38, 36);
break;
case 117:
return jjMoveStringLiteralDfa3_1(active0, 0x4000L);
case 118:
if ((active0 & 0x4000000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 50, 42);
+ return jjStartNfaWithStates_1(2, 50, 36);
break;
default :
break;
@@ -585,11 +585,11 @@
{
case 101:
if ((active0 & 0x4000L) != 0L)
- return jjStartNfaWithStates_1(3, 14, 42);
+ return jjStartNfaWithStates_1(3, 14, 36);
break;
case 108:
if ((active0 & 0x10000L) != 0L)
- return jjStartNfaWithStates_1(3, 16, 42);
+ return jjStartNfaWithStates_1(3, 16, 36);
break;
case 115:
return jjMoveStringLiteralDfa4_1(active0, 0x8000L);
@@ -615,11 +615,11 @@
return jjMoveStringLiteralDfa5_1(active0, 0x100000000000L);
case 101:
if ((active0 & 0x8000L) != 0L)
- return jjStartNfaWithStates_1(4, 15, 42);
+ return jjStartNfaWithStates_1(4, 15, 36);
break;
case 121:
if ((active0 & 0x80000000000L) != 0L)
- return jjStartNfaWithStates_1(4, 43, 42);
+ return jjStartNfaWithStates_1(4, 43, 36);
break;
default :
break;
@@ -711,7 +711,7 @@
{
case 102:
if ((active0 & 0x100000000000L) != 0L)
- return jjStartNfaWithStates_1(9, 44, 42);
+ return jjStartNfaWithStates_1(9, 44, 36);
break;
default :
break;
@@ -740,7 +740,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 41;
+ jjnewStateCnt = 36;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -755,77 +755,39 @@
{
switch(jjstateSet[--i])
{
- case 41:
- if ((0x3ff001000000000L & l) != 0L)
- {
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
- }
- else if ((0x600000000000L & l) != 0L)
- jjCheckNAddStates(4, 6);
- else if (curChar == 58)
- {
- if (kind > 54)
- kind = 54;
- }
- if ((0x3ff001000000000L & l) != 0L)
- jjCheckNAddStates(7, 10);
- if ((0x3ff001000000000L & l) != 0L)
- {
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(34);
- }
- if ((0x1800000000L & l) != 0L)
- jjCheckNAddStates(11, 14);
- break;
case 0:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 9)
kind = 9;
- jjCheckNAddStates(15, 19);
+ jjCheckNAddStates(4, 8);
}
else if ((0x1800000000L & l) != 0L)
{
if (kind > 53)
kind = 53;
- jjCheckNAddStates(20, 25);
+ jjCheckNAddTwoStates(34, 35);
}
else if (curChar == 39)
- jjCheckNAddStates(26, 30);
+ jjCheckNAddStates(9, 13);
else if (curChar == 34)
- jjCheckNAddStates(31, 35);
+ jjCheckNAddStates(14, 18);
else if (curChar == 46)
jjCheckNAdd(1);
break;
- case 42:
+ case 36:
if ((0x3ff001000000000L & l) != 0L)
{
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
- }
- else if ((0x600000000000L & l) != 0L)
- jjCheckNAddStates(4, 6);
- else if (curChar == 58)
- {
if (kind > 54)
kind = 54;
+ jjCheckNAdd(35);
}
if ((0x3ff001000000000L & l) != 0L)
- jjCheckNAddStates(11, 14);
- if ((0x3ff001000000000L & l) != 0L)
- jjCheckNAddStates(7, 10);
- if ((0x3ff001000000000L & l) != 0L)
{
if (kind > 53)
kind = 53;
jjCheckNAdd(34);
}
- if ((0x1800000000L & l) != 0L)
- jjCheckNAddStates(11, 14);
break;
case 1:
if ((0x3ff000000000000L & l) == 0L)
@@ -850,7 +812,7 @@
break;
if (kind > 9)
kind = 9;
- jjCheckNAddStates(15, 19);
+ jjCheckNAddStates(4, 8);
break;
case 6:
if ((0x3ff000000000000L & l) == 0L)
@@ -905,15 +867,15 @@
break;
case 17:
if (curChar == 34)
- jjCheckNAddStates(31, 35);
+ jjCheckNAddStates(14, 18);
break;
case 18:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(19, 21);
break;
case 20:
if (curChar == 34)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(19, 21);
break;
case 21:
if (curChar == 34 && kind > 12)
@@ -929,15 +891,15 @@
break;
case 25:
if (curChar == 39)
- jjCheckNAddStates(26, 30);
+ jjCheckNAddStates(9, 13);
break;
case 26:
if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(39, 41);
+ jjCheckNAddStates(22, 24);
break;
case 28:
if (curChar == 39)
- jjCheckNAddStates(39, 41);
+ jjCheckNAddStates(22, 24);
break;
case 29:
if (curChar == 39 && kind > 12)
@@ -956,7 +918,7 @@
break;
if (kind > 53)
kind = 53;
- jjCheckNAddStates(20, 25);
+ jjCheckNAddTwoStates(34, 35);
break;
case 34:
if ((0x3ff001000000000L & l) == 0L)
@@ -966,31 +928,11 @@
jjCheckNAdd(34);
break;
case 35:
- if ((0x3ff001000000000L & l) != 0L)
- jjCheckNAddStates(7, 10);
- break;
- case 36:
- if ((0x1800000000L & l) != 0L)
- jjCheckNAddStates(11, 14);
- break;
- case 37:
- if ((0x3ff001000000000L & l) != 0L)
- jjCheckNAddStates(11, 14);
- break;
- case 38:
- if ((0x600000000000L & l) != 0L)
- jjCheckNAddStates(4, 6);
- break;
- case 39:
- if (curChar == 58 && kind > 54)
- kind = 54;
- break;
- case 40:
if ((0x3ff001000000000L & l) == 0L)
break;
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
+ if (kind > 54)
+ kind = 54;
+ jjCheckNAdd(35);
break;
default : break;
}
@@ -1003,45 +945,21 @@
{
switch(jjstateSet[--i])
{
- case 41:
- if ((0x7fffffe87fffffeL & l) != 0L)
- {
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
- }
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(11, 14);
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(7, 10);
- if ((0x7fffffe87fffffeL & l) != 0L)
- {
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(34);
- }
- break;
case 0:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 53)
kind = 53;
- jjCheckNAddStates(20, 25);
+ jjCheckNAddTwoStates(34, 35);
break;
- case 42:
+ case 36:
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
+ if (kind > 54)
+ kind = 54;
+ jjCheckNAdd(35);
}
if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(11, 14);
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(11, 14);
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(7, 10);
- if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 53)
kind = 53;
@@ -1050,19 +968,19 @@
break;
case 2:
if ((0x2000000020L & l) != 0L)
- jjAddStates(42, 43);
+ jjAddStates(25, 26);
break;
case 10:
if ((0x2000000020L & l) != 0L)
- jjAddStates(44, 45);
+ jjAddStates(27, 28);
break;
case 14:
if ((0x2000000020L & l) != 0L)
- jjAddStates(46, 47);
+ jjAddStates(29, 30);
break;
case 18:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(19, 21);
break;
case 19:
if (curChar == 92)
@@ -1070,11 +988,11 @@
break;
case 20:
if (curChar == 92)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(19, 21);
break;
case 22:
if ((0xffffffffefffffffL & l) != 0L)
- jjAddStates(48, 49);
+ jjAddStates(31, 32);
break;
case 23:
if (curChar == 92)
@@ -1087,7 +1005,7 @@
break;
case 26:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(39, 41);
+ jjCheckNAddStates(22, 24);
break;
case 27:
if (curChar == 92)
@@ -1095,11 +1013,11 @@
break;
case 28:
if (curChar == 92)
- jjCheckNAddStates(39, 41);
+ jjCheckNAddStates(22, 24);
break;
case 30:
if ((0xffffffffefffffffL & l) != 0L)
- jjAddStates(50, 51);
+ jjAddStates(33, 34);
break;
case 31:
if (curChar == 92)
@@ -1113,23 +1031,11 @@
jjCheckNAdd(34);
break;
case 35:
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(7, 10);
- break;
- case 36:
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(11, 14);
- break;
- case 37:
- if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddStates(11, 14);
- break;
- case 40:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
+ if (kind > 54)
+ kind = 54;
+ jjCheckNAdd(35);
break;
default : break;
}
@@ -1146,32 +1052,14 @@
{
switch(jjstateSet[--i])
{
- case 41:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- {
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(34);
- }
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(7, 10);
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(11, 14);
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- {
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
- }
- break;
case 0:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
if (kind > 53)
kind = 53;
- jjCheckNAddStates(20, 25);
+ jjCheckNAddTwoStates(34, 35);
break;
- case 42:
+ case 36:
if (jjCanMove_1(hiByte, i1, i2, l1, l2))
{
if (kind > 53)
@@ -1179,25 +1067,19 @@
jjCheckNAdd(34);
}
if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(7, 10);
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(11, 14);
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(11, 14);
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
{
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
+ if (kind > 54)
+ kind = 54;
+ jjCheckNAdd(35);
}
break;
case 18:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(36, 38);
+ jjAddStates(19, 21);
break;
case 22:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(48, 49);
+ jjAddStates(31, 32);
break;
case 24:
case 32:
@@ -1206,11 +1088,11 @@
break;
case 26:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(39, 41);
+ jjAddStates(22, 24);
break;
case 30:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(50, 51);
+ jjAddStates(33, 34);
break;
case 34:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -1220,23 +1102,11 @@
jjCheckNAdd(34);
break;
case 35:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(7, 10);
- break;
- case 36:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(11, 14);
- break;
- case 37:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2))
- jjCheckNAddStates(11, 14);
- break;
- case 40:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- if (kind > 55)
- kind = 55;
- jjCheckNAdd(40);
+ if (kind > 54)
+ kind = 54;
+ jjCheckNAdd(35);
break;
default : break;
}
@@ -1249,17 +1119,16 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 41 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 36 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
}
}
static final int[] jjnextStates = {
- 0, 1, 3, 5, 36, 38, 39, 35, 36, 38, 39, 36, 37, 38, 39, 6,
- 7, 8, 13, 14, 34, 35, 36, 38, 39, 40, 26, 27, 29, 30, 31, 18,
- 19, 21, 22, 23, 18, 19, 21, 26, 27, 29, 3, 4, 11, 12, 15, 16,
- 22, 23, 30, 31,
+ 0, 1, 3, 5, 6, 7, 8, 13, 14, 26, 27, 29, 30, 31, 18, 19,
+ 21, 22, 23, 18, 19, 21, 26, 27, 29, 3, 4, 11, 12, 15, 16, 22,
+ 23, 30, 31,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
{
@@ -1300,7 +1169,7 @@
"\154\164", "\76\75", "\147\145", "\74\75", "\154\145", "\75\75", "\145\161", "\41\75",
"\156\145", "\41", "\156\157\164", "\46\46", "\141\156\144", "\174\174", "\157\162",
"\145\155\160\164\171", "\151\156\163\164\141\156\143\145\157\146", "\52", "\53", "\55", "\77", "\57",
-"\144\151\166", "\45", "\155\157\144", null, null, null, null, null, null, null, };
+"\144\151\166", "\45", "\155\157\144", null, null, null, null, null, null, };
public static final String[] lexStateNames = {
"DEFAULT",
"IN_EXPRESSION",
@@ -1308,17 +1177,17 @@
public static final int[] jjnewLexState = {
-1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1,
};
static final long[] jjtoToken = {
- 0x8fffffffffff60fL,
+ 0x47ffffffffff60fL,
};
static final long[] jjtoSkip = {
0x1f0L,
};
protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[41];
-private final int[] jjstateSet = new int[82];
+private final int[] jjrounds = new int[36];
+private final int[] jjstateSet = new int[72];
protected char curChar;
public ELParserTokenManager(SimpleCharStream stream){
if (SimpleCharStream.staticFlag)
@@ -1340,7 +1209,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 41; i-- > 0;)
+ for (i = 36; i-- > 0;)
jjrounds[i] = 0x80000000;
}
public void ReInit(SimpleCharStream stream, int lexState)
@@ -1413,9 +1282,9 @@
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_1();
- if (jjmatchedPos == 0 && jjmatchedKind > 59)
+ if (jjmatchedPos == 0 && jjmatchedKind > 58)
{
- jjmatchedKind = 59;
+ jjmatchedKind = 58;
}
break;
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-01 07:36:39 UTC (rev 759)
+++ trunk/webapps/docs/changelog.xml 2008-09-01 11:36:23 UTC (rev 760)
@@ -16,6 +16,22 @@
<body>
+<section name="JBoss Web 2.1.1.CR7 (remm)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Sync with EL from Tomcat, to fix a number of complex expressions. (remm)
+ </fix>
+ <fix>
+ <bug>45691</bug>: Fix possible duplicates variable names. (markt)
+ </fix>
+ <fix>
+ <bug>45666</bug>: Fir infinite loop on include. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.1.CR6 (remm)">
<subsection name="General">
<changelog>
16 years, 3 months
JBossWeb SVN: r759 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-01 03:36:39 -0400 (Mon, 01 Sep 2008)
New Revision: 759
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/Http11Protocol.java
Log:
Add back missing socketBuffer attribute (Issue 215381)
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/Http11Protocol.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2008-08-29 14:54:13 UTC (rev 758)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2008-09-01 07:36:39 UTC (rev 759)
@@ -262,7 +262,10 @@
public int getProcessorCache() { return this.processorCache; }
public void setProcessorCache(int processorCache) { this.processorCache = processorCache; }
- // *
+ protected int socketBuffer = 9000;
+ public int getSocketBuffer() { return socketBuffer; }
+ public void setSocketBuffer(int socketBuffer) { this.socketBuffer = socketBuffer; }
+
/**
* This field indicates if the protocol is secure from the perspective of
* the client (= https is used).
@@ -625,6 +628,7 @@
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
processor.setRestrictedUserAgents(proto.restrictedUserAgents);
+ processor.setSocketBuffer(proto.socketBuffer);
processor.setMaxSavePostSize(proto.maxSavePostSize);
processor.setServer(proto.server);
register(processor);
16 years, 3 months