Projects >> structr >>181e43d80825ccf10e063af9723557c636f4f9be

Chunk
Conflicting content 
	private boolean dontModifyAccessTime                 = false;

	//~--- fields ---------------------------------------------------------
<<<<<<< HEAD
	private final Map ranges = new ConcurrentHashMap<>();
	private final Map attrs      = Collections.synchronizedMap(new LinkedHashMap());
	private AccessMode accessMode                = AccessMode.Frontend;
	private Authenticator authenticator          = null;
	private Principal cachedUser                 = null;
	private HttpServletRequest request           = null;
	private HttpServletResponse response         = null;
	private Set customView               = null;
	private String cachedUserName                = null;
	private String cachedUserId                  = null;
=======
	private final Map ranges                                     = new ConcurrentHashMap<>();
	private final Map attrs                                          = Collections.synchronizedMap(new LinkedHashMap());
	private AccessMode accessMode                                                    = AccessMode.Frontend;
	private Authenticator authenticator                                              = null;
	private Principal cachedUser                                                     = null;
	private HttpServletRequest request                                               = null;
	private HttpServletResponse response                                             = null;
	private Set customView                                                   = null;
	private String cachedUserName                                                    = null;
	private String cachedUserId                                                      = null;
>>>>>>> 80564c2f035170acfb6272657f22159319154c81

	//~--- constructors ---------------------------------------------------
	private SecurityContext() {
Solution content 
	private boolean dontModifyAccessTime                 = false;

	//~--- fields ---------------------------------------------------------
	private final Map ranges = new ConcurrentHashMap<>();
	private final Map attrs      = Collections.synchronizedMap(new LinkedHashMap());
	private AccessMode accessMode                = AccessMode.Frontend;
	private Authenticator authenticator          = null;
	private Principal cachedUser                 = null;
	private HttpServletRequest request           = null;
	private HttpServletResponse response         = null;
	private Set customView               = null;
	private String cachedUserName                = null;
	private String cachedUserId                  = null;

	//~--- constructors ---------------------------------------------------
	private SecurityContext() {
File
SecurityContext.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
					AccessPathCache.put(startNode, this, mask);

<<<<<<< HEAD
					if (mask.allowsPermission(permission)) {
=======
						AccessPathCache.put(principal, this, mask);
>>>>>>> 80564c2f035170acfb6272657f22159319154c81

						return true;
					}
Solution content 

					if (mask.allowsPermission(permission)) {
						AccessPathCache.put(principal, this, mask);

						return true;
					}
File
AbstractNode.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
			} else {

<<<<<<< HEAD
				final String relTypes            = getPermissionPropagationRelTypes();
				final Map params = new HashMap<>();
=======
				final GraphDatabaseService db    = StructrApp.getInstance().getGraphDatabaseService();
				final String relTypes            = getPermissionPropagationRelTypes();
				final Map params = new HashMap<>();
				final long principalId           = principal.getId();
>>>>>>> 80564c2f035170acfb6272657f22159319154c81

				params.put("id1", principalId);
				params.put("id2", this.getId());
Solution content 
			} else {

				final GraphDatabaseService db    = StructrApp.getInstance().getGraphDatabaseService();
				final String relTypes            = getPermissionPropagationRelTypes();
				final Map params = new HashMap<>();
				final long principalId           = principal.getId();

				params.put("id1", principalId);
				params.put("id2", this.getId());
File
AbstractNode.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
							AccessPathCache.put(principal, this, mask);

<<<<<<< HEAD
						return true;
=======
							return true;
						}
>>>>>>> 80564c2f035170acfb6272657f22159319154c81
					}
				}
Solution content 
							AccessPathCache.put(principal, this, mask);

							return true;
						}
					}
				}
File
AbstractNode.java
Developer's decision
Version 1
Kind of conflict
Other