January 2014 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2358 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-29 06:44:13 -0500 (Wed, 29 Jan 2014) New Revision: 2358 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Log: Port patch: filter out empty subprotocol. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-01-28 17:06:08 UTC (rev 2357) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-01-29 11:44:13 UTC (rev 2358) @@ -132,7 +132,8 @@ Constants.CONNECTION_HEADER_VALUE); resp.setHeader(HandshakeResponse.SEC_WEBSOCKET_ACCEPT, getWebSocketAccept(key)); - if (subProtocol != null) { + if (subProtocol != null && subProtocol.length() > 0) { + // RFC6455 4.2.2 explicitly states "" is not valid here resp.setHeader("Sec-WebSocket-Protocol", subProtocol); } if (!extensions.isEmpty()) {

10 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2357 - in branches/7.4.x/src/main/java/org/apache: tomcat/websocket/server and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-28 12:06:08 -0500 (Tue, 28 Jan 2014) New Revision: 2357 Modified: branches/7.4.x/src/main/java/org/apache/catalina/websocket/StreamInbound.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java Log: Remove a number of setCCL since in web they are called from the regular servlet stack. Modified: branches/7.4.x/src/main/java/org/apache/catalina/websocket/StreamInbound.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/catalina/websocket/StreamInbound.java 2014-01-23 16:06:23 UTC (rev 2356) +++ branches/7.4.x/src/main/java/org/apache/catalina/websocket/StreamInbound.java 2014-01-28 17:06:08 UTC (rev 2357) @@ -117,18 +117,18 @@ byte opCode = frame.getOpCode(); if (opCode == Constants.OPCODE_BINARY) { - doOnBinaryData(wsIs); + onBinaryData(wsIs); } else if (opCode == Constants.OPCODE_TEXT) { InputStreamReader r = new InputStreamReader(wsIs, new Utf8Decoder()); - doOnTextData(r); + onTextData(r); } else if (opCode == Constants.OPCODE_CLOSE){ closeOutboundConnection(frame); event.close(); } else if (opCode == Constants.OPCODE_PING) { getWsOutbound().pong(frame.getPayLoad()); } else if (opCode == Constants.OPCODE_PONG) { - doOnPong(frame.getPayLoad()); + onPong(frame.getPayLoad()); } else { // Unknown OpCode closeOutboundConnection( @@ -153,37 +153,11 @@ } } - private void doOnBinaryData(InputStream is) throws IOException { - // Need to call onBinaryData using the web application's class loader - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); - try { - onBinaryData(is); - } finally { - t.setContextClassLoader(cl); - } - } - - - private void doOnTextData(Reader r) throws IOException { - // Need to call onTextData using the web application's class loader - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); - try { - onTextData(r); - } finally { - t.setContextClassLoader(cl); - } - } - - private void closeOutboundConnection(int status, ByteBuffer data) throws IOException { try { getWsOutbound().close(status, data); } finally { - doOnClose(status); + onClose(status); } } @@ -191,7 +165,7 @@ try { getWsOutbound().close(frame); } finally { - doOnClose(Constants.STATUS_CLOSE_NORMAL); + onClose(Constants.STATUS_CLOSE_NORMAL); } } @@ -213,30 +187,10 @@ } } - private void doOnPong(ByteBuffer payload) { - // Need to call onPong using the web application's class loader - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); - try { - onPong(payload); - } finally { - t.setContextClassLoader(cl); - } - } - public final void onUpgradeComplete() { outbound = new WsOutbound(event, this, outboundByteBufferSize, outboundCharBufferSize); - // Need to call onOpen using the web application's class loader - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); - try { - onOpen(outbound); - } finally { - t.setContextClassLoader(cl); - } + onOpen(outbound); } /** Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 2014-01-23 16:06:23 UTC (rev 2356) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 2014-01-28 17:06:08 UTC (rev 2357) @@ -44,8 +44,6 @@ */ public class WsHttpUpgradeHandler implements HttpUpgradeHandler { - private final ClassLoader applicationClassLoader; - private Endpoint ep; private EndpointConfig endpointConfig; private WsServerContainer webSocketContainer; @@ -59,7 +57,6 @@ public WsHttpUpgradeHandler() { - applicationClassLoader = Thread.currentThread().getContextClassLoader(); } @@ -100,12 +97,6 @@ httpSessionId = ((HttpSession) session).getId(); } - // Need to call onOpen using the web application's class loader - // Create the frame using the application's class loader so it can pick - // up application specific config from the ServerContainerImpl - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); try { WsRemoteEndpointImplServer wsRemoteEndpointServer = new WsRemoteEndpointImplServer(sos, webSocketContainer); @@ -125,8 +116,6 @@ sis.setReadListener(new WsReadListener(this, wsFrame)); } catch (DeploymentException e) { throw new IllegalArgumentException(e); - } finally { - t.setContextClassLoader(cl); } } @@ -144,15 +133,7 @@ private void onError(Throwable throwable) { - // Need to call onError using the web application's class loader - Thread t = Thread.currentThread(); - ClassLoader cl = t.getContextClassLoader(); - t.setContextClassLoader(applicationClassLoader); - try { - ep.onError(wsSession, throwable); - } finally { - t.setContextClassLoader(cl); - } + ep.onError(wsSession, throwable); }

10 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2356 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-23 11:06:23 -0500 (Thu, 23 Jan 2014) New Revision: 2356 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java Log: PojoMethodMapping didn't look like the right location in the end, trying the direct superclass constructor. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java 2014-01-23 15:25:58 UTC (rev 2355) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java 2014-01-23 16:06:23 UTC (rev 2356) @@ -49,6 +49,12 @@ int indexSession, long maxMessageSize) { this.pojo = pojo; this.method = method; + try { + this.method.setAccessible(true); + } catch (Exception e) { + // It is better to make sure the method is accessible, but + // ignore exceptions and hope for the best + } this.session = session; this.params = params; this.indexPayload = indexPayload; Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 2014-01-23 15:25:58 UTC (rev 2355) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 2014-01-23 16:06:23 UTC (rev 2356) @@ -121,12 +121,6 @@ if (!Modifier.isPublic(m.getModifiers())) { throw new DeploymentException(MESSAGES.methodNotPublic(m.getName())); } - try { - m.setAccessible(true); - } catch (Exception e) { - // It is better to make sure the method is accessible, but - // ignore exceptions and hope for the best - } }

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2355 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-23 10:25:58 -0500 (Thu, 23 Jan 2014) New Revision: 2355 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Revert as the WS spec is explicit about that (will see the test result). Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 15:10:04 UTC (rev 2354) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 15:25:58 UTC (rev 2355) @@ -405,8 +405,8 @@ state = State.CLOSING; + sendCloseMessage(closeReasonMessage); fireEndpointOnClose(closeReasonLocal); - sendCloseMessage(closeReasonMessage); state = State.CLOSED; } @@ -428,8 +428,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + sendCloseMessage(closeReason); fireEndpointOnClose(closeReason); - sendCloseMessage(closeReason); state = State.CLOSED; }

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2354 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-23 10:10:04 -0500 (Thu, 23 Jan 2014) New Revision: 2354 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java Log: Use setAccessible on reflection methods, just in case. If it fails, ignore. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 2014-01-23 12:44:12 UTC (rev 2353) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 2014-01-23 15:10:04 UTC (rev 2354) @@ -121,6 +121,12 @@ if (!Modifier.isPublic(m.getModifiers())) { throw new DeploymentException(MESSAGES.methodNotPublic(m.getName())); } + try { + m.setAccessible(true); + } catch (Exception e) { + // It is better to make sure the method is accessible, but + // ignore exceptions and hope for the best + } }

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2353 - in branches/7.4.x/src/main/java/org/apache/tomcat/websocket: pojo and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-23 07:44:12 -0500 (Thu, 23 Jan 2014) New Revision: 2353 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java Log: Try to call onError if an error occurs during onClose. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 12:15:22 UTC (rev 2352) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 12:44:12 UTC (rev 2353) @@ -45,6 +45,7 @@ import javax.websocket.Session; import javax.websocket.WebSocketContainer; +import org.apache.tomcat.util.ExceptionUtils; import org.jboss.web.WebsocketsLogger; public class WsSession implements Session { @@ -452,6 +453,9 @@ t.setContextClassLoader(applicationClassLoader); try { localEndpoint.onClose(this, closeReason); + } catch (Throwable throwable) { + ExceptionUtils.handleThrowable(throwable); + localEndpoint.onError(this, throwable); } finally { t.setContextClassLoader(cl); } Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java 2014-01-23 12:15:22 UTC (rev 2352) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java 2014-01-23 12:44:12 UTC (rev 2353) @@ -96,8 +96,8 @@ methodMapping.getOnClose().invoke(pojo, methodMapping.getOnCloseArgs(pathParameters, session, closeReason)); } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); WebsocketsLogger.ROOT_LOGGER.onCloseFailed(pojo.getClass().getName(), t); + handleOnCloseError(session, t); } } @@ -111,6 +111,19 @@ } + private void handleOnCloseError(Session session, Throwable t) { + // If really fatal - re-throw + ExceptionUtils.handleThrowable(t); + + // Trigger the error handler and close the session + onError(session, t); + try { + session.close(); + } catch (IOException ioe) { + WebsocketsLogger.ROOT_LOGGER.closeSessionFailed(ioe); + } + } + @Override public final void onError(Session session, Throwable throwable) {

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2352 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-23 07:15:22 -0500 (Thu, 23 Jan 2014) New Revision: 2352 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Try some fixes. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-01-22 09:10:12 UTC (rev 2351) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-01-23 12:15:22 UTC (rev 2352) @@ -232,6 +232,7 @@ } else { f2sh.get(timeout, TimeUnit.MILLISECONDS); } + payload.clear(); } catch (InterruptedException e) { throw new IOException(e); } catch (ExecutionException e) { Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-22 09:10:12 UTC (rev 2351) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 12:15:22 UTC (rev 2352) @@ -404,8 +404,8 @@ state = State.CLOSING; + fireEndpointOnClose(closeReasonLocal); sendCloseMessage(closeReasonMessage); - fireEndpointOnClose(closeReasonLocal); state = State.CLOSED; } @@ -427,8 +427,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + fireEndpointOnClose(closeReason); sendCloseMessage(closeReason); - fireEndpointOnClose(closeReason); state = State.CLOSED; }

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2351 - branches/7.4.x/src/main/java/org/apache/jasper/compiler.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-22 04:10:12 -0500 (Wed, 22 Jan 2014) New Revision: 2351 Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java Log: Port patch: remove useless trim. Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-22 09:09:40 UTC (rev 2350) +++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-22 09:10:12 UTC (rev 2351) @@ -155,7 +155,7 @@ if (hasNext()) { Token t2 = nextToken(); if (t2 instanceof Id) { - s1 = s2.trim(); + s1 = s2; s2 = t2.toTrimmedString(); if (hasNext()) { curToken = nextToken();

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2350 - in branches/7.4.x/src/main/java/org: jboss/web and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-22 04:09:40 -0500 (Wed, 22 Jan 2014) New Revision: 2350 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameBase.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java Log: Port patch: close after IO error. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameBase.java 2014-01-21 15:44:23 UTC (rev 2349) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameBase.java 2014-01-22 09:09:40 UTC (rev 2350) @@ -329,8 +329,7 @@ try { mhPong.onMessage(new WsPongMessage(controlBufferBinary)); } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - wsSession.getLocal().onError(wsSession, t); + handleThrowableOnSend(t); } finally { controlBufferBinary.clear(); } @@ -371,8 +370,7 @@ messageBufferText.toString()); } } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - wsSession.getLocal().onError(wsSession, t); + handleThrowableOnSend(t); } finally { messageBufferText.clear(); } @@ -525,6 +523,15 @@ } + private void handleThrowableOnSend(Throwable t) throws WsIOException { + ExceptionUtils.handleThrowable(t); + wsSession.getLocal().onError(wsSession, t); + CloseReason cr = new CloseReason(CloseCodes.CLOSED_ABNORMALLY, + MESSAGES.closeAfterError()); + throw new WsIOException(cr); + } + + @SuppressWarnings("unchecked") private void sendMessageBinary(ByteBuffer msg, boolean last) throws WsIOException { @@ -546,8 +553,7 @@ ((MessageHandler.Whole<ByteBuffer>) binaryMsgHandler).onMessage(msg); } } catch(Throwable t) { - ExceptionUtils.handleThrowable(t); - wsSession.getLocal().onError(wsSession, t); + handleThrowableOnSend(t); } } Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-21 15:44:23 UTC (rev 2349) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-22 09:09:40 UTC (rev 2350) @@ -462,7 +462,13 @@ // 125 is maximum size for the payload of a control message ByteBuffer msg = ByteBuffer.allocate(125); CloseCode closeCode = closeReason.getCloseCode(); - msg.putShort((short) closeCode.getCode()); + // CLOSED_ABNORMALLY should not be put on the wire + if (closeCode == CloseCodes.CLOSED_ABNORMALLY) { + // PROTOCOL_ERROR is probably better than GOING_AWAY here + msg.putShort((short) CloseCodes.PROTOCOL_ERROR.getCode()); + } else { + msg.putShort((short) closeCode.getCode()); + } String reason = closeReason.getReasonPhrase(); if (reason != null && reason.length() > 0) { Modified: branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java =================================================================== --- branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java 2014-01-21 15:44:23 UTC (rev 2349) +++ branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java 2014-01-22 09:09:40 UTC (rev 2350) @@ -305,4 +305,7 @@ @Message(id = 8589, value = "The maximum supported message size for this implementation is Integer.MAX_VALUE") IllegalArgumentException messageTooLarge(); + @Message(id = 8590, value = "Closing session following IO error") + String closeAfterError(); + }

10 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2349 - branches/7.4.x/src/main/java/org/apache/jasper/compiler.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-01-21 10:44:23 -0500 (Tue, 21 Jan 2014) New Revision: 2349 Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELNode.java branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java Log: Another EL parser patch (not the last one since it has to do the same as the real EL parser without being a real EL parser). Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELNode.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELNode.java 2014-01-20 20:30:54 UTC (rev 2348) +++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELNode.java 2014-01-21 15:44:23 UTC (rev 2349) @@ -113,16 +113,18 @@ */ public static class Function extends ELNode { - private String prefix; - private String name; + private final String prefix; + private final String name; + private final String originalText; private String uri; private FunctionInfo functionInfo; private String methodName; private String[] parameters; - Function(String prefix, String name) { + Function(String prefix, String name, String originalText) { this.prefix = prefix; this.name = name; + this.originalText = originalText; } public void accept(Visitor v) throws JasperException { @@ -137,6 +139,10 @@ return name; } + public String getOriginalText() { + return originalText; + } + public void setUri(String uri) { this.uri = uri; } Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-20 20:30:54 UTC (rev 2348) +++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/ELParser.java 2014-01-21 15:44:23 UTC (rev 2349) @@ -38,7 +38,7 @@ private Token curToken; // current token private Token prevToken; // previous token - private StringBuilder whiteSpace = new StringBuilder(); + private String whiteSpace = ""; private final ELNode.Nodes expr; @@ -96,7 +96,9 @@ * * @return An ELNode.Nodes representing the EL expression * - * TODO: Can this be refactored to use the standard EL implementation? + * Note: This can not be refactored to use the standard EL implementation as + * the EL API does not provide the level of access required to the + * parsed expression. */ private ELNode.Nodes parseEL() { @@ -115,7 +117,7 @@ // Output whatever is in buffer if (buf.length() > 0) { ELexpr.add(new ELNode.ELText(buf.toString())); - buf = new StringBuilder(); + buf.setLength(0); } if (!parseFunction()) { ELexpr.add(new ELNode.ELText(curToken.toString())); @@ -138,12 +140,13 @@ * arguments */ private boolean parseFunction() { - if (!(curToken instanceof Id) || isELReserved(curToken.toString()) || + if (!(curToken instanceof Id) || isELReserved(curToken.toTrimmedString()) || prevToken instanceof Char && prevToken.toChar() == '.') { return false; } String s1 = null; // Function prefix - String s2 = curToken.toString(); // Function name + String s2 = curToken.toTrimmedString(); // Function name + int start = index - curToken.toString().length(); Token original = curToken; if (hasNext()) { int mark = getIndex() - whiteSpace.length(); @@ -153,7 +156,7 @@ Token t2 = nextToken(); if (t2 instanceof Id) { s1 = s2.trim(); - s2 = t2.toString(); + s2 = t2.toTrimmedString(); if (hasNext()) { curToken = nextToken(); } @@ -161,7 +164,7 @@ } } if (curToken.toChar() == '(') { - ELexpr.add(new ELNode.Function(s1, s2.trim())); + ELexpr.add(new ELNode.Function(s1, s2, expression.substring(start, index - 1))); return true; } curToken = original; @@ -245,29 +248,29 @@ } private String getAndResetWhiteSpace() { - String result = whiteSpace.toString(); - whiteSpace = new StringBuilder(); + String result = whiteSpace; + whiteSpace = ""; return result; } /* + * Implementation note: This method assumes that it is always preceded by a + * call to hasNext() in order for whitespace handling to be correct. + * * @return The next token in the EL expression buffer. */ private Token nextToken() { prevToken = curToken; - skipSpaces(); if (hasNextChar()) { char ch = nextChar(); if (Character.isJavaIdentifierStart(ch)) { - StringBuilder buf = new StringBuilder(); - buf.append(ch); + int start = index - 1; while (index < expression.length() && Character.isJavaIdentifierPart( ch = expression.charAt(index))) { - buf.append(ch); nextChar(); } - return new Id(getAndResetWhiteSpace(), buf.toString()); + return new Id(getAndResetWhiteSpace(), expression.substring(start, index)); } if (ch == '\'' || ch == '"') { @@ -311,13 +314,14 @@ */ private void skipSpaces() { + int start = index; while (hasNextChar()) { char c = expression.charAt(index); if (c > ' ') break; - whiteSpace.append(c); index++; } + whiteSpace = expression.substring(start, index); } private boolean hasNextChar() { @@ -359,6 +363,10 @@ return whiteSpace; } + String toTrimmedString() { + return ""; + } + String getWhiteSpace() { return whiteSpace; } @@ -379,6 +387,11 @@ public String toString() { return whiteSpace + id; } + + @Override + String toTrimmedString() { + return id; + } } /* @@ -402,6 +415,11 @@ public String toString() { return whiteSpace + ch; } + + @Override + String toTrimmedString() { + return "" + ch; + } } /* @@ -420,6 +438,11 @@ public String toString() { return whiteSpace + value; } + + @Override + String toTrimmedString() { + return value; + } } public char getType() { @@ -445,11 +468,7 @@ @Override public void visit(Function n) throws JasperException { - if (n.getPrefix() != null) { - output.append(n.getPrefix()); - output.append(':'); - } - output.append(n.getName()); + output.append(n.getOriginalText()); output.append('('); }

10 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits January 2014