Merge pull request #530 from iterate-ch/feature/response-propstat-status

Return status from first propstat element when found.
lookfirst · Jan 10, 2025 · 0aca217 · 0aca217
2 parents cfeefc2 + 7ee726b
commit 0aca217
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/com/github/sardine/DavResource.java b/src/main/java/com/github/sardine/DavResource.java
@@ -168,6 +168,18 @@ public DavResource(Response response) throws URISyntaxException
 	 */
 	private int getStatusCode(Response response)
 	{
+		List<Propstat> list = response.getPropstat();
+		for(Propstat propstat : list) {
+			if(propstat.getStatus() != null) {
+				try {
+					return BasicLineParser.parseStatusLine(propstat.getStatus(), null).getStatusCode();
+				}
+				catch(ParseException e) {
+					log.warning(String.format("Failed to parse status line: %s", propstat.getStatus()));
+					return -1;
+				}
+			}
+		}
 		String status = response.getStatus();
 		if (status == null || status.isEmpty())
 		{

diff --git a/src/test/java/com/github/sardine/FunctionalSardineTest.java b/src/test/java/com/github/sardine/FunctionalSardineTest.java
@@ -226,8 +226,7 @@ public void getDavQuota() throws IOException
         Sardine sardine = SardineFactory.begin();
         sardine.createDirectory(url);
         DavQuota davQuota = sardine.getQuota(url);
-        assertTrue(davQuota.getQuotaAvailableBytes() > 0);
-        assertEquals(0, davQuota.getQuotaUsedBytes());
+        assertNull(davQuota);
     }
 
     @Test(expected = SardineException.class)