Merge git://github.com/andershedstrom/cloudinary_java

tallevami-home · tallevami-home · commit cb3ec758b14e · 2013-02-24T22:33:59.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 bin
 lib
 target
+.classpath
+.project
+.settings
diff --git a/pom.xml b/pom.xml
@@ -4,6 +4,9 @@
   <artifactId>cloudinary_java</artifactId>
   <version>0.1-SNAPSHOT</version>
   <name>Cloudinary Java Client Library</name>
+  <properties>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+  </properties>
   <dependencies>
   	<dependency>
   		<groupId>commons-lang</groupId>
@@ -51,4 +54,8 @@
   		<version>4.10</version>
   	</dependency>
   </dependencies>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>tests</testSourceDirectory>
+  </build>
 </project>
diff --git a/src/com/cloudinary/Uploader.java b/src/com/cloudinary/Uploader.java
@@ -152,7 +152,7 @@ public Map callApi(String action, Map<String, String> params, Map options, Objec
 			}
 		}
 
-		if (file instanceof String && !((String) file).matches("^https?:")) {
+		if (file instanceof String && !((String) file).matches("^https?:.*")) {
 			file = new File((String) file);
 		}
 		if (file instanceof File) {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public Map callApi(String action, Map<String, String> params, Map options, Objec`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- if (file instanceof String && !((String) file).matches("^https?:")) {`
	`155`	`+ if (file instanceof String && !((String) file).matches("^https?:.*")) {`
`156`	`156`	`file = new File((String) file);`
`157`	`157`	`}`
`158`	`158`	`if (file instanceof File) {`