svn commit: r1296775 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Author: markt
Date: Sun Mar 4 10:18:25 2012
New Revision: 1296775
URL: http://svn.apache.org/viewvc?rev=1296775view=rev
Log:
Remove unused imports
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1296775r1=1296774r2=1296775view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Sun Mar 4 10:18:25 2012
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.http11;
-import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
@@ -27,7 +26,6 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SecureNioChannel;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -43,13 +41,13 @@ import org.apache.tomcat.util.net.Socket
* @author Filip Hanik
*/
public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
-
+
private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
@Override
protected Log getLog() { return log; }
-
+
@Override
protected AbstractEndpoint.Handler getHandler() {
@@ -73,7 +71,7 @@ public class Http11NioProtocol extends A
// Properties
-
+
private Http11ConnectionHandler cHandler;
// Pool setup
@@ -81,19 +79,19 @@ public class Http11NioProtocol extends A
public void setPollerThreadCount(int count) {
((NioEndpoint)endpoint).setPollerThreadCount(count);
}
-
+
public int getPollerThreadCount() {
return ((NioEndpoint)endpoint).getPollerThreadCount();
}
-
+
public void setSelectorTimeout(long timeout) {
((NioEndpoint)endpoint).setSelectorTimeout(timeout);
}
-
+
public long getSelectorTimeout() {
return ((NioEndpoint)endpoint).getSelectorTimeout();
}
-
+
public void setAcceptorThreadPriority(int threadPriority) {
((NioEndpoint)endpoint).setAcceptorThreadPriority(threadPriority);
}
@@ -105,12 +103,12 @@ public class Http11NioProtocol extends A
public int getAcceptorThreadPriority() {
return ((NioEndpoint)endpoint).getAcceptorThreadPriority();
}
-
+
public int getPollerThreadPriority() {
return ((NioEndpoint)endpoint).getThreadPriority();
}
-
-
+
+
public boolean getUseSendfile() {
return ((NioEndpoint)endpoint).getUseSendfile();
}
@@ -118,7 +116,7 @@ public class Http11NioProtocol extends A
public void setUseSendfile(boolean useSendfile) {
((NioEndpoint)endpoint).setUseSendfile(useSendfile);
}
-
+
// Tcp setup
public void setOomParachute(int oomParachute) {
((NioEndpoint)endpoint).setOomParachute(oomParachute);
@@ -143,7 +141,7 @@ public class Http11NioProtocol extends A
Http11ConnectionHandler(Http11NioProtocol proto) {
this.proto = proto;
}
-
+
@Override
protected AbstractProtocol getProtocol() {
return proto;
@@ -153,8 +151,8 @@ public class Http11NioProtocol extends A
protected Log getLog() {
return log;
}
-
-
+
+
@Override
public SSLImplementation getSslImplementation() {
return proto.sslImplementation;
@@ -166,7 +164,7 @@ public class Http11NioProtocol extends A
*/
@Override
public void release(SocketChannel socket) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled())
log.debug(Iterating through our connections to release a
socket channel:+socket);
boolean released = false;
Iteratorjava.util.Map.EntryNioChannel, Http11NioProcessor it =
connections.entrySet().iterator();
@@ -181,10 +179,10 @@ public class Http11NioProtocol extends A
break;
}
}
-if (log.isDebugEnabled())
+if (log.isDebugEnabled())
log.debug(Done iterating through our connections to release a
socket channel:+socket + released:+released);
}
-
+
/**
* Expected to be used by the Poller to release resources on socket
* close, errors etc.
@@ -203,7 +201,7 @@
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #52 from Johno Crawford jo...@sulake.com 2012-03-04 12:12:58 UTC --- Created attachment 28415 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28415 Connection close not called on IOE I am able to continually produce this using Chrome 17.0.963.56 m and just closing the tab whilst the websocket connection is active. Please find attached fix proposal. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52819] New: problems in org.apache.jasper.xmlparser.EncodingMap#fIANA2JavaMap
https://issues.apache.org/bugzilla/show_bug.cgi?id=52819 Bug #: 52819 Summary: problems in org.apache.jasper.xmlparser.EncodingMap#fIANA2JavaMap Product: Tomcat 7 Version: trunk Platform: PC Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: bluewolf.ch...@gmail.com Classification: Unclassified I'm doing porting Jasper of Tomcat 7 to our product. I was adding 'UTF-32' mappings to the org.apache.jasper.xmlparser.EncodingMap#fIANA2JavaMap when I found that there were some unmatched mappings compared to http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html . Referring to that Java SE 6 document, fIANA2JavaMap.put(UTF-16BE, UnicodeBig); fIANA2JavaMap.put(UTF-16LE, UnicodeLittle); should be fIANA2JavaMap.put(UTF-16BE, UnicodeBigUnmarked); fIANA2JavaMap.put(UTF-16LE, UnicodeLittleUnmarked); . And I know that Tomcat 7 is targerted to Java SE 6. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1296813 - /tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Author: markt
Date: Sun Mar 4 14:23:41 2012
New Revision: 1296813
URL: http://svn.apache.org/viewvc?rev=1296813view=rev
Log:
Ensure we try and send a close message on an IOE as well as triggering
onClose()
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1296813r1=1296812r2=1296813view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Sun Mar
4 14:23:41 2012
@@ -106,12 +106,12 @@ public abstract class StreamInbound impl
public final SocketState onData() throws IOException {
// Must be start the start of a message (which may consist of multiple
// frames)
-
WsInputStream wsIs = new WsInputStream(processor, getWsOutbound());
-WsFrame frame = wsIs.nextFrame(true);
-while (frame != null) {
-try {
+try {
+WsFrame frame = wsIs.nextFrame(true);
+
+while (frame != null) {
// TODO User defined extensions may define values for rsv
if (frame.getRsv() 0) {
closeOutboundConnection(
@@ -140,21 +140,21 @@ public abstract class StreamInbound impl
Constants.STATUS_PROTOCOL_ERROR, null);
return SocketState.CLOSED;
}
-} catch (MalformedInputException mie) {
-// Invalid UTF-8
-closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
-return SocketState.CLOSED;
-} catch (UnmappableCharacterException uce) {
-// Invalid UTF-8
-closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
-return SocketState.CLOSED;
-} catch (IOException ioe) {
-// Given something must have gone to reach this point, this
-// might not work but try it anyway.
-closeOutboundConnection(Constants.STATUS_PROTOCOL_ERROR, null);
-return SocketState.CLOSED;
+frame = wsIs.nextFrame(false);
}
-frame = wsIs.nextFrame(false);
+} catch (MalformedInputException mie) {
+// Invalid UTF-8
+closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
+return SocketState.CLOSED;
+} catch (UnmappableCharacterException uce) {
+// Invalid UTF-8
+closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
+return SocketState.CLOSED;
+} catch (IOException ioe) {
+// Given something must have gone to reach this point, this
+// might not work but try it anyway.
+closeOutboundConnection(Constants.STATUS_PROTOCOL_ERROR, null);
+return SocketState.CLOSED;
}
return SocketState.UPGRADED;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #53 from Mark Thomas ma...@apache.org 2012-03-04 14:25:41 UTC --- (In reply to comment #52) Created attachment 28415 [details] Connection close not called on IOE I fixed this slightly differently in trunk, mainly because I wanted to avoid the nested try/catch blocks. Let us know if there is still an issue. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2808 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1296813 Blamelist: markt Build succeeded! sincerely, -The Buildbot
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #54 from Johno Crawford jo...@sulake.com 2012-03-05 00:48:11 UTC --- Created attachment 28416 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28416 Multiplayer snake example Please find attached patch for simple multiplayer snake example. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #55 from Johno Crawford jo...@sulake.com 2012-03-05 00:51:03 UTC --- (In reply to comment #53) (In reply to comment #52) Created attachment 28415 [details] Connection close not called on IOE I fixed this slightly differently in trunk, mainly because I wanted to avoid the nested try/catch blocks. Let us know if there is still an issue. Works as expected, thanks! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: License/Notice Files
On 4 March 2012 03:44, Jeremy Boynes jboy...@apache.org wrote: On Feb 29, 2012, at 11:37 AM, sebb wrote: On 29 February 2012 19:15, Olivier Lamy ol...@apache.org wrote: Perso, I prefer using something which read pom and generate automatically NL from metadatas rather than maintaining those files manually (for me manually means you always missed to add/modify :-) ) (but sure it's my POV) AFAICT that just moves the work from maintaining the NL to creating and maintaining the metadata. It also means that the NL files are not present in SVN (unless they are checked in after generation). My preference here is also to have them generated. We want the metadata in the project descriptor to be valid anyway, and maintaining the templates for LICENSE and NOTICE would be handled by maintainers of the Apache resources. We don't have any dependencies requiring a notice, and if we do this should be covered with append-resources. The files wouldn't be in SVN but will be in the distributed archives. Having this done automatically rather than by configuring each archiver will be easier to keep straight. I think just about every project has NL files at the top-level of SVN. [If they don't, perhaps they should] Not sure it is an absolute requirement (unlike in archives and jars) but it is helpful for 3rd parties who browse the SVN tree. -- Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52659] Shared memory becomes corrupted
https://issues.apache.org/bugzilla/show_bug.cgi?id=52659 Alex Samad alex.sa...@yieldbroker.com changed: What|Removed |Added Priority|P2 |P1 Severity|normal |critical -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52659] Shared memory becomes corrupted
https://issues.apache.org/bugzilla/show_bug.cgi?id=52659 Alex Samad alex.sa...@yieldbroker.com changed: What|Removed |Added OS/Version|All |Windows Server 2008 --- Comment #1 from Alex Samad alex.sa...@yieldbroker.com 2012-03-05 05:27:12 UTC --- I have changed OS platform. and changed to critical... Done more testing. setup 1 client - 1 IIS 7.5 + nod_jk - jboss server IIS7 app pool is setup for 4 process (web garden) and overlapping recycle we have the client making 300 - 500 connections to the IIS7.5 whilst this is going on we recycle the application pool. modjk becomes confused and i believe corrupts the shm area all requests get 500 error. Whilst leaving the application on, we restart IIS7.5 so there are 500 connection attempted to be made and when IIS restarts we go straight back into 500 errors. we have to block in the inbound connections and then start IIS and wait a few seconds and then let the connections in (allow them through the firewall) so sign i see of this. the ajp logs has errors for uri's not being allocation.. and then stopping (presumably after the config file has been read). I believe we should change locking for the windows platform to pessi also why is the extension taking request when it hasn't read the config file yet !!! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1296944 - /tomcat/native/trunk/native/src/poll.c
Author: costin Date: Mon Mar 5 06:30:17 2012 New Revision: 1296944 URL: http://svn.apache.org/viewvc?rev=1296944view=rev Log: EINTR needs to be returned to java in order for Poll.interrupt() to work, it is already handled in AprEndpoint. ( there is no value of having an interrupt method if it is swallowed in native, quite hard to figure out why it doesn't work...) Modified: tomcat/native/trunk/native/src/poll.c Modified: tomcat/native/trunk/native/src/poll.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/poll.c?rev=1296944r1=1296943r2=1296944view=diff == --- tomcat/native/trunk/native/src/poll.c (original) +++ tomcat/native/trunk/native/src/poll.c Mon Mar 5 06:30:17 2012 @@ -358,7 +358,7 @@ TCN_IMPLEMENT_CALL(jint, Poll, poll)(TCN #ifdef TCN_DO_STATISTICS p-sp_eintr++; #endif -continue; +/* Pass it to the caller - interrupt() was called */ } TCN_ERROR_WRAP(rv); #ifdef TCN_DO_STATISTICS - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-taglibs-standard has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 16 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-taglibs-standard : Standard Taglib - tomcat-taglibs-standard-install : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency taglibs-standard-spec failed with reason build failed -INFO- Optional dependency httpunit failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard] M2_HOME: /opt/maven2 - at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430) at org.codehaus.classworlds.Launcher.main(Launcher.java:375) Caused by: org.apache.maven.project.ProjectBuildingException: Cannot find parent: org.apache.taglibs:taglibs-parent for project: null:taglibs-standard:pom:1.2-SNAPSHOT for project null:taglibs-standard:pom:1.2-SNAPSHOT at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1396) at org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:823) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:508) at org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:200) at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:604) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:487) at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:391) ... 12 more Caused by: org.apache.maven.project.ProjectBuildingException: POM 'org.apache.taglibs:taglibs-parent' not found in repository: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) for project org.apache.taglibs:taglibs-parent at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:605) at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1392) ... 18 more Caused by: org.apache.maven.artifact.resolver.ArtifactNotFoundException: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:228) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:90) at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:558) ... 19 more Caused by: org.apache.maven.wagon.ResourceDoesNotExistException: Unable to download the artifact from any repository at
