You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/04/02 20:09:14 UTC
svn commit: r159782 -
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
Author: olegk
Date: Sat Apr 2 10:09:14 2005
New Revision: 159782
URL: http://svn.apache.org/viewcvs?view=rev&rev=159782
Log:
Added OldIOSocketHttpDataReceiver and OldIOSocketHttpDataTransmitter
Added:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java (with props)
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java (with props)
Added: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java?view=auto&rev=159782
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java (added)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java Sat Apr 2 10:09:14 2005
@@ -0,0 +1,117 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.net.Socket;
+
+import org.apache.http.io.InputStreamHttpDataReceiver;
+
+/**
+ * <p>
+ * </p>
+ * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
+ *
+ * @version $Revision$
+ *
+ * @since 4.0
+ */
+public class OldIOSocketHttpDataReceiver extends InputStreamHttpDataReceiver {
+
+ static private final Class SOCKET_TIMEOUT_CLASS = SocketTimeoutExceptionClass();
+
+ /**
+ * Returns <code>SocketTimeoutExceptionClass<code> or <code>null</code> if the class
+ * does not exist.
+ *
+ * @return <code>SocketTimeoutExceptionClass<code>, or <code>null</code> if unavailable.
+ */
+ static private Class SocketTimeoutExceptionClass() {
+ try {
+ return Class.forName("java.net.SocketTimeoutException");
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ private static boolean isSocketTimeoutException(final InterruptedIOException e) {
+ if (SOCKET_TIMEOUT_CLASS != null) {
+ return SOCKET_TIMEOUT_CLASS.isInstance(e);
+ } else {
+ return true;
+ }
+ }
+
+ private final Socket socket;
+
+ private static InputStream createInputStream(final Socket socket) throws IOException {
+ if (socket == null) {
+ throw new IllegalArgumentException("Socket may not be null");
+ }
+ int buffersize = socket.getReceiveBufferSize();
+ if ((buffersize > 2048) || (buffersize <= 0)) {
+ buffersize = 2048;
+ }
+ return new BufferedInputStream(socket.getInputStream(), buffersize);
+ }
+
+ protected OldIOSocketHttpDataReceiver(final Socket socket) throws IOException {
+ super(createInputStream(socket));
+ this.socket = socket;
+ }
+
+ public boolean isDataAvailable(int timeout) throws IOException {
+ InputStream instream = getInputStream();
+ boolean result = instream.available() > 0;
+ if (!result) {
+ int oldtimeout = this.socket.getSoTimeout();
+ try {
+ this.socket.setSoTimeout(timeout);
+ instream.mark(1);
+ int byteRead = instream.read();
+ if (byteRead != -1) {
+ instream.reset();
+ result = true;
+ }
+ } catch (InterruptedIOException e) {
+ if (!isSocketTimeoutException(e)) {
+ throw e;
+ }
+ } finally {
+ socket.setSoTimeout(oldtimeout);
+ }
+ }
+ return result;
+ }
+
+}
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java?view=auto&rev=159782
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java (added)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java Sat Apr 2 10:09:14 2005
@@ -0,0 +1,68 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import org.apache.http.io.OutputStreamHttpDataTransmitter;
+
+/**
+ * <p>
+ * </p>
+ * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
+ *
+ * @version $Revision$
+ *
+ * @since 4.0
+ */
+public class OldIOSocketHttpDataTransmitter extends OutputStreamHttpDataTransmitter {
+
+ private final Socket socket;
+
+ private static OutputStream createOutputStream(final Socket socket) throws IOException {
+ if (socket == null) {
+ throw new IllegalArgumentException("Socket may not be null");
+ }
+ int buffersize = socket.getSendBufferSize();
+ if ((buffersize > 2048) || (buffersize <= 0)) {
+ buffersize = 2048;
+ }
+ return new BufferedOutputStream(socket.getOutputStream(), buffersize);
+ }
+
+ protected OldIOSocketHttpDataTransmitter(final Socket socket) throws IOException {
+ super(createOutputStream(socket));
+ this.socket = socket;
+ }
+
+}
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain