User: jung
Date: 00/12/22 07:43:23
Modified: src/de/infor/ce/http Environment.java HttpException.java
Server.java
Log:
repackaged thread pooling. Coherent environment. Exception extensions.
Revision Changes Path
1.4 +3 -3 zoap/src/de/infor/ce/http/Environment.java
Index: Environment.java
===================================================================
RCS file: /products/cvs/ejboss/zoap/src/de/infor/ce/http/Environment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Environment.java 2000/12/22 08:34:45 1.3
+++ Environment.java 2000/12/22 15:43:23 1.4
@@ -30,7 +30,7 @@
* Environment contains static variables and other helping stuff that either
influence
* the compilation of the package or initialise its runtime environment from config
files.
* @author jung
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class Environment {
@@ -76,7 +76,7 @@
public static final String RESOURCE_PATH = "";
/** whether a config file is loaded */
- public static final boolean READ_CONFIG_FILE = true;
+ public static final boolean READ_CONFIG_FILE = false;
/** where the resources needed to configure this module are found */
public static final String CONFIG_FILE_SUFFIX = ".conf";
1.4 +12 -9 zoap/src/de/infor/ce/http/HttpException.java
Index: HttpException.java
===================================================================
RCS file: /products/cvs/ejboss/zoap/src/de/infor/ce/http/HttpException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpException.java 2000/12/22 08:34:45 1.3
+++ HttpException.java 2000/12/22 15:43:23 1.4
@@ -25,7 +25,7 @@
* The most general exception thrown in this http-server package. Something must
have been wrong. Catch
* this if you are an ignorant or just lazy.
* @author jung
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class HttpException extends Exception {
@@ -63,7 +63,10 @@
/** manipulate the toString method to also show the embedded throwable */
public String toString() {
- return super.toString() + ": embedded exception " +
actualThrowable.toString();
+ if (actualThrowable != null) {
+ return super.toString() + ": embedded exception " +
actualThrowable.toString();
+ } else
+ return super.toString();
}
/** accesses the embedded throwable */
@@ -78,12 +81,12 @@
actualThrowable = throwable;
}
- /** the printStackTrace method produces recursive traces */
- public void printStackTrace() {
- super.printStackTrace();
- if(actualThrowable!=null)
- actualThrowable.printStackTrace();
- }
+ /** the printStackTrace method produces recursive traces */
+ public void printStackTrace() {
+ super.printStackTrace();
+ if (actualThrowable != null)
+ actualThrowable.printStackTrace();
+ }
} // HttpException
1.4 +6 -6 zoap/src/de/infor/ce/http/Server.java
Index: Server.java
===================================================================
RCS file: /products/cvs/ejboss/zoap/src/de/infor/ce/http/Server.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Server.java 2000/12/22 08:34:46 1.3
+++ Server.java 2000/12/22 15:43:23 1.4
@@ -21,7 +21,7 @@
package de.infor.ce.http;
-import de.infor.ce.util.ThreadPool;
+import de.infor.ce.thread.ThreadPool;
import java.net.ServerSocket;
import java.net.Socket;
@@ -44,7 +44,7 @@
* It currently lacks support for sophisticated tranfer-encodings and
* multiple-commands per connection which should be incorporated in the near future.
* @author jung
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class Server implements Runnable {
@@ -216,9 +216,9 @@
} catch (NullPointerException e) {
if (Environment.DEBUG_LEVEL > 0 || Environment.LOG_LEVEL > 0) {
- Environment.CONSOLE.error(toString() + ".run():
encountered " + e+" which probably means that this service has been stopped.");
- Environment.CONSOLE.exception(e);
- }
+ Environment.CONSOLE.error(toString() + ".run():
encountered " + e + " which probably means that this service has been stopped.");
+ Environment.CONSOLE.exception(e);
+ }
// happens if the server socket has already been set to null
before
// listen has been called
