hammant 2003/01/27 14:18:55
Modified: altrmi/src/java/org/apache/excalibur/altrmi/server
ServerMonitor.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
ConsoleServerMonitor.java
LogEnabledServerMonitor.java NullServerMonitor.java
StreamServerConnection.java
Log:
Change in server monitor signature. Server stream handles another failing
type.
Revision Changes Path
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ServerMonitor.java
Index: ServerMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ServerMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerMonitor.java 19 Jan 2003 11:10:01 -0000 1.1
+++ ServerMonitor.java 27 Jan 2003 22:18:54 -0000 1.2
@@ -28,7 +28,7 @@
void classNotFound(ClassNotFoundException e);
- void unexpectedIOException(String s, IOException e);
+ void unexpectedException(String s, Exception e);
void stopServerError(String s, Exception e);
}
1.2 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ConsoleServerMonitor.java
Index: ConsoleServerMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ConsoleServerMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConsoleServerMonitor.java 19 Jan 2003 11:10:00 -0000 1.1
+++ ConsoleServerMonitor.java 27 Jan 2003 22:18:54 -0000 1.2
@@ -43,9 +43,9 @@
System.out.println("[classNotFound] " + e.getMessage());
}
- public void unexpectedIOException(String s, IOException e)
+ public void unexpectedException(String s, Exception e)
{
- System.out.println("[unexpectedIOException] " + s + " : " +
e.getMessage());
+ System.out.println("[unexpectedException] " + s + " : " +
e.getMessage());
}
public void stopServerError(String s, Exception e)
1.2 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/LogEnabledServerMonitor.java
Index: LogEnabledServerMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/LogEnabledServerMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogEnabledServerMonitor.java 19 Jan 2003 11:10:00 -0000 1.1
+++ LogEnabledServerMonitor.java 27 Jan 2003 22:18:54 -0000 1.2
@@ -26,31 +26,31 @@
public void closeError(String s, IOException e)
{
- getLogger().error("[closeError] " + s + " : " + e.getMessage());
+ getLogger().error("[closeError] " + s, e);
}
public void badConnection(String s, BadConnectionException bce)
{
- getLogger().error("[badConnection] " + s + " : " + bce.getMessage());
+ getLogger().error("[badConnection] " + s, bce);
}
public void classNotFound(ClassNotFoundException e)
{
- getLogger().fatalError("[classNotFound] " + e.getMessage());
+ getLogger().fatalError("[classNotFound]", e);
}
- public void unexpectedIOException(String s, IOException e)
+ public void unexpectedException(String s, Exception e)
{
- getLogger().error("[unexpectedIOException] " + s + " : " +
e.getMessage());
+ getLogger().error("[unexpectedException] " + s, e);
}
public void stopServerError(String s, Exception e)
{
- getLogger().error("[stopServerError] " + s + " : " + e.getMessage());
+ getLogger().error("[stopServerError] " + s, e);
}
public void connectionProblem(String s, IOException ioe)
{
- getLogger().error("[connectionProblem] " + s + " : " +
ioe.getMessage());
+ getLogger().error("[connectionProblem] " + s, ioe);
}
}
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/NullServerMonitor.java
Index: NullServerMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/NullServerMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NullServerMonitor.java 19 Jan 2003 11:10:00 -0000 1.1
+++ NullServerMonitor.java 27 Jan 2003 22:18:54 -0000 1.2
@@ -39,7 +39,7 @@
{
}
- public void unexpectedIOException(String s, IOException e)
+ public void unexpectedException(String s, Exception e)
{
}
1.14 +10 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/StreamServerConnection.java
Index: StreamServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/StreamServerConnection.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StreamServerConnection.java 19 Jan 2003 11:10:00 -0000 1.13
+++ StreamServerConnection.java 27 Jan 2003 22:18:54 -0000 1.14
@@ -17,6 +17,8 @@
import org.apache.excalibur.altrmi.common.EndConnectionReply;
import org.apache.excalibur.altrmi.common.ConnectionException;
import org.apache.excalibur.altrmi.common.BadConnectionException;
+import org.apache.excalibur.altrmi.common.ExceptionReply;
+import org.apache.excalibur.altrmi.common.InvocationException;
import org.apache.excalibur.altrmi.server.ServerConnection;
import org.apache.excalibur.altrmi.server.ServerMonitor;
@@ -140,15 +142,20 @@
}
else
{
-
m_serverMonitor.unexpectedIOException("StreamServerConnection.run(): Unexpected
IOE #1", ioe);
+
m_serverMonitor.unexpectedException("StreamServerConnection.run(): Unexpected
IOE #1", ioe);
m_readWriter.close();
}
}
+ catch (NullPointerException npe)
+ {
+
m_serverMonitor.unexpectedException("StreamServerConnection.run(): Unexpected
NPE", npe);
+ reply = new ExceptionReply(new
InvocationException("NullPointerException on server: " + npe.getMessage()));
+ }
}
}
catch (IOException e)
{
-
m_serverMonitor.unexpectedIOException("StreamServerConnection.run(): Unexpected
IOE #2", e);
+
m_serverMonitor.unexpectedException("StreamServerConnection.run(): Unexpected
IOE #2", e);
}
catch (ClassNotFoundException e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
