Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv6557/src/org/beepcore/beep/core
Modified Files:
InputDataStreamAdapter.java
Log Message:
changed to use commons-logging
Index: InputDataStreamAdapter.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/InputDataStreamAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** InputDataStreamAdapter.java 31 Oct 2001 00:32:37 -0000 1.1
--- InputDataStreamAdapter.java 5 Oct 2002 15:28:49 -0000 1.2
***************
*** 1,2 ****
--- 1,18 ----
+ /*
+ * InputDataStreamAdapter.java $Revision$ $Date$
+ *
+ * Copyright (c) 2002 Huston Franklin. All rights reserved.
+ *
+ * The contents of this file are subject to the Blocks Public License (the
+ * "License"); You may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at http://www.beepcore.org/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ */
package org.beepcore.beep.core;
***************
*** 7,12 ****
import java.util.Hashtable;
import org.beepcore.beep.util.BufferSegment;
- import org.beepcore.beep.util.Log;
public class InputDataStreamAdapter extends java.io.InputStream {
--- 23,30 ----
import java.util.Hashtable;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
import org.beepcore.beep.util.BufferSegment;
public class InputDataStreamAdapter extends java.io.InputStream {
***************
*** 377,381 ****
ids.buffers.wait();
} catch (InterruptedException e) {
! Log.logEntry(Log.SEV_ERROR, e);
}
}
--- 395,399 ----
ids.buffers.wait();
} catch (InterruptedException e) {
! log.error("waiting for buffer", e);
}
}
***************
*** 401,404 ****
--- 419,424 ----
private static final int STATE_PARSING_HEADERS_TERMINATOR = 5;
private static final int STATE_HEADERS_PARSED = 6;
+
+ private Log log = LogFactory.getLog(this.getClass());
private int state = STATE_INIT;
|
