#1 merge latest

DICE-UNC · Nov 2, 2015 · f6260dd · f6260dd
2 parents b73f1b7 + 27ce220
commit f6260dd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -53,3 +53,10 @@ Added a rename() operation to DataTransferOperations to clarify difference betwe
 ###  CollectionPager not navigating strict acl dirs with heuristics #148 
 
 Add heuristic path guessing to CollectionPagerAO, which is an upgrade of the old CollectionAndDataObjectListAndSearchAOImpl
+###  across federation browsing under strict acls doesn't interpolate home/ and find subdirs viewable #39 
+
+Update cross-zone path heuristic guessing so one can reasonably browse 'down' to home dirs in federated zones
+
+### Misc
+
+Lots of small fixes, pull requests, iRODS compatability tests and fixes through work with consortium
diff --git a/jargon-core/src/main/java/org/irods/jargon/core/packinstr/DataObjInp.java b/jargon-core/src/main/java/org/irods/jargon/core/packinstr/DataObjInp.java
@@ -37,7 +37,8 @@ public class DataObjInp extends AbstractIRODSPackingInstruction {
 	public static final String LOCAL_PATH = "localPath";
 	public static final String ALL = "all";
 
-	public static final int TRUNCATE = 512;
+	public static final int CREATE = 512;
+	public static final int TRUNCATE = 1024;
 
 	public static final int CREATE_FILE_API_NBR = 601;
 	public static final int DELETE_FILE_API_NBR = 615;
@@ -913,7 +914,7 @@ private int translateOpenFlagsValue() throws JargonException {
 			tagOpenFlags = 0 | TRUNCATE;
 			break;
 		case WRITE_TRUNCATE:
-			tagOpenFlags = 1 | TRUNCATE;
+			tagOpenFlags = 1 | TRUNCATE | CREATE;
 			break;
 		case READ_WRITE:
 			tagOpenFlags = 2;

diff --git a/jargon-core/src/main/java/org/irods/jargon/core/pub/DataObjectAOImpl.java b/jargon-core/src/main/java/org/irods/jargon/core/pub/DataObjectAOImpl.java
@@ -1528,7 +1528,13 @@ private int processGetAfterResourceDetermined(
 							transferControlBlock,
 							transferStatusCallbackListener, clientSideAction);
 
-					getIRODSProtocol().operationComplete(l1descInx);
+					if (!this.getIRODSServerProperties()
+							.isTheIrodsServerAtLeastAtTheGivenReleaseVersion(
+									"rods4.1.6")) {
+						getIRODSProtocol().operationComplete(l1descInx);
+
+					}
+
 					FileRestartInfo fileRestartInfo = retrieveRestartInfoIfAvailable(
 							RestartType.GET, irodsFileToGet.getAbsolutePath());
 					if (fileRestartInfo != null) {