mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Another shot at TCP CLOSE_WAIT issue, and tiny code tweak

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1057 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-09-18 10:27:17 +00:00
parent 5dd4b663ce
commit 938c44c17a
2 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/google/zxing/oned/EAN13Reader.java
View file

@ -58,7 +58,7 @@ public final class EAN13Reader extends AbstractUPCEANReader {
// in binary: // in binary:
// 0 1 1 0 0 1 == 0x19 // 0 1 1 0 0 1 == 0x19
// //
public static final int[] FIRST_DIGIT_ENCODINGS = { static final int[] FIRST_DIGIT_ENCODINGS = {
0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A 0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A
}; };

91
zxingorg/src/com/google/zxing/web/DecodeServlet.java
View file

@ -48,7 +48,7 @@ import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.impl.conn.SingleClientConnManager;
import org.apache.http.params.BasicHttpParams; import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams; import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
@ -65,7 +65,6 @@ import java.net.UnknownHostException;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@ -103,11 +102,12 @@ public final class DecodeServlet extends HttpServlet {
possibleFormats.add(BarcodeFormat.ITF); possibleFormats.add(BarcodeFormat.ITF);
possibleFormats.add(BarcodeFormat.QR_CODE); possibleFormats.add(BarcodeFormat.QR_CODE);
possibleFormats.add(BarcodeFormat.DATAMATRIX); possibleFormats.add(BarcodeFormat.DATAMATRIX);
possibleFormats.add(BarcodeFormat.PDF417);
HINTS.put(DecodeHintType.POSSIBLE_FORMATS, possibleFormats); HINTS.put(DecodeHintType.POSSIBLE_FORMATS, possibleFormats);
} }
private HttpClient client; private HttpParams params;
private ClientConnectionManager connectionManager; private SchemeRegistry registry;
private DiskFileItemFactory diskFileItemFactory; private DiskFileItemFactory diskFileItemFactory;
@Override @Override
@ -116,16 +116,13 @@ public final class DecodeServlet extends HttpServlet {
Logger logger = Logger.getLogger("com.google.zxing"); Logger logger = Logger.getLogger("com.google.zxing");
logger.addHandler(new ServletContextLogHandler(servletConfig.getServletContext())); logger.addHandler(new ServletContextLogHandler(servletConfig.getServletContext()));
HttpParams params = new BasicHttpParams(); params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
SchemeRegistry registry = new SchemeRegistry(); registry = new SchemeRegistry();
registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
registry.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443)); registry.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443));
connectionManager = new ThreadSafeClientConnManager(params, registry);
client = new DefaultHttpClient(connectionManager, params);
diskFileItemFactory = new DiskFileItemFactory(); diskFileItemFactory = new DiskFileItemFactory();
log.info("DecodeServlet configured"); log.info("DecodeServlet configured");
@ -152,48 +149,54 @@ public final class DecodeServlet extends HttpServlet {
return; return;
} }
ClientConnectionManager connectionManager = new SingleClientConnManager(params, registry);
HttpClient client = new DefaultHttpClient(connectionManager, params);
HttpUriRequest getRequest = new HttpGet(imageURI); HttpUriRequest getRequest = new HttpGet(imageURI);
getRequest.addHeader("Connection", "close"); // Avoids CLOSE_WAIT socket issue? getRequest.addHeader("Connection", "close"); // Avoids CLOSE_WAIT socket issue?
HttpResponse getResponse;
try { try {
getResponse = client.execute(getRequest);
} catch (IllegalArgumentException iae) {
// Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
} catch (SocketException se) {
// Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
} catch (UnknownHostException uhe) {
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
}
if (getResponse.getStatusLine().getStatusCode() != HttpServletResponse.SC_OK) { HttpResponse getResponse;
response.sendRedirect("badurl.jspx"); try {
return; getResponse = client.execute(getRequest);
} } catch (IllegalArgumentException iae) {
if (!isSizeOK(getResponse)) { // Thrown if hostname is bad or null
response.sendRedirect("badimage.jspx"); getRequest.abort();
return; response.sendRedirect("badurl.jspx");
} return;
} catch (SocketException se) {
// Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
} catch (UnknownHostException uhe) {
getRequest.abort();
response.sendRedirect("badurl.jspx");
return;
}
if (getResponse.getStatusLine().getStatusCode() != HttpServletResponse.SC_OK) {
response.sendRedirect("badurl.jspx");
return;
}
if (!isSizeOK(getResponse)) {
response.sendRedirect("badimage.jspx");
return;
}
log.info("Decoding " + imageURI);
HttpEntity entity = getResponse.getEntity();
InputStream is = entity.getContent();
try {
processStream(is, request, response);
} finally {
entity.consumeContent();
is.close();
}
log.info("Decoding " + imageURI);
HttpEntity entity = getResponse.getEntity();
InputStream is = entity.getContent();
try {
processStream(is, request, response);
} finally { } finally {
entity.consumeContent(); connectionManager.shutdown();
is.close();
// Hmm, trying harder here to avoid the CLOSE_WAIT problem:
connectionManager.closeExpiredConnections();
connectionManager.closeIdleConnections(0L, TimeUnit.MILLISECONDS);
} }
} }