| Chunk |
|---|
| Conflicting content |
|---|
return false;
if (propagationDirection.equals(SchemaRelationshipNode.Direction.None)) {
return false;
}
<<<<<<< HEAD
if (!relDirection.equals(propagationDirection)) {
}
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.read)) {
mask.addRead();
}
// if we arrived here with write, write was allowed
if (permission.equals(Permission.write)) {
mask.addWrite();
}
// if we arrived here with delete, delete was allowed
if (permission.equals(Permission.delete)) {
mask.addDelete();
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.accessControl)) {
mask.addAccessControl();
}
applyCurrentStep(propagation, mask);
if (mask.allowsPermission(permission)) {
AccessPathCache.put(startNode, this, mask);
return true;
}
}
=======
if (!relDirection.equals(propagationDirection)) {
return false;
}
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.read)) {
mask.addRead();
}
// if we arrived here with write, write was allowed
if (permission.equals(Permission.write)) {
mask.addWrite();
}
// if we arrived here with delete, delete was allowed
if (permission.equals(Permission.delete)) {
mask.addDelete();
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.accessControl)) {
mask.addAccessControl();
}
applyCurrentStep(propagation, mask);
if (mask.allowsPermission(permission)) {
AccessPathCache.put(startNode, this, mask);
return true;
}
}
>>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c
} else {
final String relTypes = getPermissionPropagationRelTypes(); |
| Solution content |
|---|
if (propagationDirection.equals(SchemaRelationshipNode.Direction.None)) {
return false;
}
if (!relDirection.equals(propagationDirection)) {
return false;
}
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.read)) {
mask.addRead();
}
// if we arrived here with write, write was allowed
if (permission.equals(Permission.write)) {
mask.addWrite();
}
// if we arrived here with delete, delete was allowed
if (permission.equals(Permission.delete)) {
mask.addDelete();
}
// if we arrived here with read, read was allowed
if (permission.equals(Permission.accessControl)) {
mask.addAccessControl();
}
applyCurrentStep(propagation, mask);
if (mask.allowsPermission(permission)) {
AccessPathCache.put(startNode, this, mask);
return true;
}
}
} else {
final String relTypes = getPermissionPropagationRelTypes(); |
| File |
|---|
| AbstractNode.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
final Path path = (Path)row.get("p");
Node previousNode = null;
boolean arrived = true;
<<<<<<< HEAD
for (final PropertyContainer container : path) {
=======
for (final PropertyContainer container : path) {
>>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c
if (container instanceof Node) {
// store previous node to determine relationship direction |
| Solution content |
|---|
final Path path = (Path)row.get("p");
Node previousNode = null;
boolean arrived = true;
for (final PropertyContainer container : path) {
if (container instanceof Node) {
// store previous node to determine relationship direction |
| File |
|---|
| AbstractNode.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
return true;
}
if (arrived && mask.allowsPermission(permission)) {
<<<<<<< HEAD
AccessPathCache.put(startNode, this, mask);
return true;
} else {
=======
AccessPathCache.put(startNode, this, mask);
} else {
>>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c
AccessPathCache.put(startNode, this, new PermissionResolutionMask());
}
} |
| Solution content |
|---|
}
if (arrived && mask.allowsPermission(permission)) {
AccessPathCache.put(startNode, this, mask);
return true;
} else {
AccessPathCache.put(startNode, this, new PermissionResolutionMask());
}
} |
| File |
|---|
| AbstractNode.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
}
=======
>>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c
} catch (Throwable t) {
t.printStackTrace();
} |
| Solution content |
|---|
}
}
}
} catch (Throwable t) {
t.printStackTrace();
} |
| File |
|---|
| AbstractNode.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
}
// ----- public static methods -----
<<<<<<< HEAD
=======
public static void invalidateCacheFor(final String uuid) {
}
>>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c
} |
| Solution content |
|---|
} } |
| File |
|---|
| AbstractNode.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
final Class otherNodeType = otherNode.getClass(); <<<<<<< HEAD final boolean desiredTypeIsAssignableFromOtherNodeType = SearchCommand.getAllSubtypesAsStringSet(desiredType.getSimpleName()).contains(otherNodeType.getSimpleName()); ======= //final boolean desiredTypeIsAssignableFromOtherNodeType = desiredType.isAssignableFrom(otherNodeType); final boolean desiredTypeIsAssignableFromOtherNodeType = SearchCommand.getAllSubtypesAsStringSet(desiredType.getSimpleName()).contains(otherNodeType.getSimpleName()); >>>>>>> b91211f430b1217cafa9f13acd9e2257666a5a1c return desiredTypeIsAssignableFromOtherNodeType; } |
| Solution content |
|---|
final Class otherNodeType = otherNode.getClass(); final boolean desiredTypeIsAssignableFromOtherNodeType = SearchCommand.getAllSubtypesAsStringSet(desiredType.getSimpleName()).contains(otherNodeType.getSimpleName()); return desiredTypeIsAssignableFromOtherNodeType; } |
| File |
|---|
| OtherNodeTypeFilter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |