Update HttpLaunch.java

Author: jiaqizho

android-SpillOver/src/frameDesign/HttpLaunch.java

@@ -27,20 +27,22 @@ public BasicHttpResponse handlerRequest(Request<?> request) throws IOException {
 		//System.setProperty("sun.net.http.allowRestrictedHeaders", "true");
 		URL url = new URL(request.getUrl());
 		HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-		for(Entry<String,String> entry : request.getHeader().entrySet()){
-			connection.addRequestProperty(entry.getKey(), entry.getValue());					
+		if(request.getHeader() != null){
+			for(Entry<String,String> entry : request.getHeader().entrySet()){
+				connection.addRequestProperty(entry.getKey(), entry.getValue());					
+			}
+			if(request.getEtag() != null){
+				connection.addRequestProperty("If-None-Match",request.getEtag());
+			} 
+			if(request.getiMS() != null){
+				connection.addRequestProperty("If-Modified-Since",request.getEtag());
+			} 
 		}
-		if(request.getEtag() != null){
-			connection.addRequestProperty("If-None-Match",request.getEtag());
-		} 
-		if(request.getiMS() != null){
-			connection.addRequestProperty("If-Modified-Since",request.getEtag());
-		} 
 		setPostParams(request,connection);
 	 	ProtocolVersion protocolVersion = new ProtocolVersion("HTTP", 1, 1);
         int responseCode = connection.getResponseCode();
         if (responseCode == -1) {
-            throw new IOException("Á¬½Óʧ°Ü");
+            throw new IOException("连接失败");
         }
         StatusLine responseStatus = new BasicStatusLine(protocolVersion,
                 connection.getResponseCode(), connection.getResponseMessage());
@@ -69,6 +71,9 @@ private void setPostParams(Request<?> request, HttpURLConnection connection) thr
 		connection.getOutputStream();
         DataOutputStream out = new DataOutputStream(connection.getOutputStream());
         Map<String,String> map = request.getParam();
+        if(map == null){
+        	return;
+        }
         String params = null;
         int record = 0;
         int size = map.entrySet().size();