Merge remote-tracking branch 'origin/master'

Conflicts: src/com/androidquery/callback/AbstractAjaxCallback.java
mohdtausif · Jul 3, 2012 · 2ad6671 · 2ad6671
2 parents 24e3e64 + 5ea3238
commit 2ad6671
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dist/build-full.jardesc b/dist/build-full.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="AndroidQuery/dist/android-query-full.0.22.9-beta.jar"/>
+    <jar path="AndroidQuery/dist/android-query-full.0.22.10.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/AndroidQuery/dist/build-full.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

diff --git a/src/com/androidquery/callback/AbstractAjaxCallback.java b/src/com/androidquery/callback/AbstractAjaxCallback.java
@@ -1610,8 +1610,10 @@ private static void writeObject(DataOutputStream dos, String name, Object obj) t
 		if(obj == null) return;
 
 		if(obj instanceof File){
+
 			File file = (File) obj;
 			writeData(dos, name, file.getName(), new FileInputStream(file));
+
 		}else if(obj instanceof byte[]){
 			writeData(dos, name, name, new ByteArrayInputStream((byte[]) obj));
 		}else{
@@ -1620,7 +1622,7 @@ private static void writeObject(DataOutputStream dos, String name, Object obj) t
 
 	}
 
-
+
 	private static void writeData(DataOutputStream dos, String name, String filename, InputStream is) throws IOException {
 
 		dos.writeBytes(twoHyphens + boundary + lineEnd);