leif 2003/09/10 05:51:43
Modified:
instrument-manager/src/java/org/apache/excalibur/instrument/manager/http/server
AbstractHTTPURLHandler.java HTTPServer.java
Log:
Add a set of pages which allow instrument data to be collected as XML.
Revision Changes Path
1.2 +39 -1
avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/http/server/AbstractHTTPURLHandler.java
Index: AbstractHTTPURLHandler.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/http/server/AbstractHTTPURLHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractHTTPURLHandler.java 8 Sep 2003 09:00:46 -0000 1.1
+++ AbstractHTTPURLHandler.java 10 Sep 2003 12:51:43 -0000 1.2
@@ -236,6 +236,24 @@
}
}
+ public long getLongParameter( Map params, String name, long defaultValue )
+ {
+ String value = getParameter( params, name, null );
+ if ( value == null )
+ {
+ return defaultValue;
+ }
+
+ try
+ {
+ return Long.parseLong( value );
+ }
+ catch ( NumberFormatException e )
+ {
+ return defaultValue;
+ }
+ }
+
public String[] getParameters( Map params, String name )
{
Object param = params.get( name );
@@ -254,6 +272,26 @@
list.toArray( ary );
return ary;
}
+ }
+
+ public long[] getLongParameters( Map params, String name, long defaultValue )
+ {
+ String[] values = getParameters( params, name );
+ long[] lValues = new long[values.length];
+
+ for ( int i = 0; i < values.length; i++ )
+ {
+ try
+ {
+ lValues[i] = Long.parseLong( values[i] );
+ }
+ catch ( NumberFormatException e )
+ {
+ lValues[i] = defaultValue;
+ }
+ }
+
+ return lValues;
}
}
1.2 +8 -2
avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/http/server/HTTPServer.java
Index: HTTPServer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/http/server/HTTPServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTTPServer.java 8 Sep 2003 09:00:46 -0000 1.1
+++ HTTPServer.java 10 Sep 2003 12:51:43 -0000 1.2
@@ -125,7 +125,8 @@
try
{
// As long as we have valid requests, keep the connection open.
- while ( handleRequest( socket.getInputStream(),
socket.getOutputStream() ) )
+ while ( handleRequest( socket.getInputStream(),
socket.getOutputStream() )
+ && !isStopping() )
{
}
}
@@ -338,6 +339,11 @@
// Do not close the output stream as it may be reused.
return true;
+ }
+ else
+ {
+ // Break out of the for loop.
+ break;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
