Author: markt
Date: Sat Nov 11 13:56:15 2006
New Revision: 473804
URL: http://svn.apache.org/viewvc?view=rev&rev=473804
Log:
Stop Eclipse complaining about class name conflict between java.lang.Thread and
o.a.t.jni.Thread
Modified:
tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/Echo.java
tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/LocalServer.java
tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/SSLServer.java
Modified: tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/Echo.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/Echo.java?view=diff&rev=473804&r1=473803&r2=473804
==============================================================================
--- tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/Echo.java
(original)
+++ tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/Echo.java Sat
Nov 11 13:56:15 2006
@@ -17,12 +17,9 @@
package org.apache.tomcat.jni;
+import java.io.InputStream;
import java.util.Properties;
-import java.io.*;
-import java.net.*;
-import java.lang.*;
-
/** Echo server example
*
* @author Mladen Turk
@@ -61,7 +58,7 @@
}
/* Acceptor thread. Listens for new connections */
- private class Acceptor extends Thread {
+ private class Acceptor extends java.lang.Thread {
private long serverSock = 0;
private long inetAddress = 0;
private long pool = 0;
@@ -139,7 +136,7 @@
}
/* Poller thread. Listens for new recycled connections */
- private class Poller extends Thread {
+ private class Poller extends java.lang.Thread {
private long serverPollset = 0;
private long pool = 0;
private int nsocks = 0;
@@ -178,7 +175,7 @@
while (true) {
try {
if (nsocks < 1) {
- Thread.sleep(1);
+ java.lang.Thread.sleep(1);
continue;
}
/* Two times size then created pollset */
@@ -223,7 +220,7 @@
}
}
- private class Worker extends Thread {
+ private class Worker extends java.lang.Thread {
private int workerId = 0;
private long clientSock = 0;
private byte [] wellcomeMsg = null;
@@ -275,7 +272,6 @@
public Echo()
{
- int i;
echoPool = Pool.create(0);
try {
echoAcceptor = new Acceptor();
Modified:
tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/LocalServer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/LocalServer.java?view=diff&rev=473804&r1=473803&r2=473804
==============================================================================
--- tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/LocalServer.java
(original)
+++ tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/LocalServer.java
Sat Nov 11 13:56:15 2006
@@ -1,11 +1,8 @@
package org.apache.tomcat.jni;
+import java.io.InputStream;
import java.util.Properties;
-import java.io.*;
-import java.net.*;
-import java.lang.*;
-
/** Local Socket server example
*
* @author Mladen Turk
@@ -41,7 +38,6 @@
public LocalServer()
{
- int i;
serverPool = Pool.create(0);
try {
serverAcceptor = new Acceptor();
@@ -65,7 +61,7 @@
}
/* Acceptor thread. Listens for new connections */
- private class Acceptor extends Thread {
+ private class Acceptor extends java.lang.Thread {
private long serverSock = 0;
private long inetAddress = 0;
private long pool = 0;
@@ -107,7 +103,7 @@
}
}
- private class Worker extends Thread {
+ private class Worker extends java.lang.Thread {
private int workerId = 0;
private long clientSock = 0;
private byte [] wellcomeMsg = null;
Modified:
tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/SSLServer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/SSLServer.java?view=diff&rev=473804&r1=473803&r2=473804
==============================================================================
--- tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/SSLServer.java
(original)
+++ tomcat/connectors/trunk/jni/examples/org/apache/tomcat/jni/SSLServer.java
Sat Nov 11 13:56:15 2006
@@ -1,11 +1,8 @@
package org.apache.tomcat.jni;
+import java.io.InputStream;
import java.util.Properties;
-import java.io.*;
-import java.net.*;
-import java.lang.*;
-
/** SSL Server server example
*
* @author Mladen Turk
@@ -54,7 +51,6 @@
public SSLServer()
{
- int i;
serverPool = Pool.create(0);
try {
/* Create SSL Context, one for each Virtual Host */
@@ -85,7 +81,7 @@
}
/* Acceptor thread. Listens for new connections */
- private class Acceptor extends Thread {
+ private class Acceptor extends java.lang.Thread {
private long serverSock = 0;
private long inetAddress = 0;
private long pool = 0;
@@ -164,7 +160,7 @@
}
}
- private class Worker extends Thread {
+ private class Worker extends java.lang.Thread {
private int workerId = 0;
private long clientSock = 0;
private byte [] wellcomeMsg = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
