Skip to content
Snippets Groups Projects
Commit f8626d56 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

FIX: docs and added missing separator

parent 7f047ecf
No related branches found
No related tags found
1 merge request!65F permission checks
...@@ -337,7 +337,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -337,7 +337,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
* stored in the cache. This allows (some) cache entries to be shared among users since the final * stored in the cache. This allows (some) cache entries to be shared among users since the final
* check is applied after the retrieval of the result set from the cache (@see {@link * check is applied after the retrieval of the result set from the cache (@see {@link
* filterEntitiesWithoutRetrievePermission}) The cache is invalidated whenever there is a write * filterEntitiesWithoutRetrievePermission}) The cache is invalidated whenever there is a write
* operation (@see {@link writeTODO}). * operation (@see {@link writeTODO}) TODO replace writeTODO and describe how invalidation is
* done.
*/ */
private static ICacheAccess<String, Serializable> cache = private static ICacheAccess<String, Serializable> cache =
Cache.getCache("HIGH_LEVEL_QUERY_CACHE"); Cache.getCache("HIGH_LEVEL_QUERY_CACHE");
...@@ -418,9 +419,9 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -418,9 +419,9 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
/** /**
* @return The result set table name. * @return The result set table name.
* @throws TransactionException * @throws QueryException
*/ */
private String sourceStrategy(final String sourceSet) throws TransactionException { private String sourceStrategy(final String sourceSet) throws QueryException {
try { try {
this.sourceSet = sourceSet; this.sourceSet = sourceSet;
initResultSetWithNameIDAndChildren(); initResultSetWithNameIDAndChildren();
...@@ -441,7 +442,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -441,7 +442,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
return this.sourceSet; return this.sourceSet;
} catch (final SQLException e) { } catch (final SQLException e) {
e.printStackTrace(); e.printStackTrace();
throw new TransactionException(e); throw new QueryException(e);
} }
} }
...@@ -1158,7 +1159,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -1158,7 +1159,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
String principal_desc = String principal_desc =
((Principal) this.user.getPrincipal()).getUsername() ((Principal) this.user.getPrincipal()).getUsername()
+ Principal.REALM_SEPARATOR + Principal.REALM_SEPARATOR
+ ((Principal) this.user.getPrincipal()).getRealm(); + ((Principal) this.user.getPrincipal()).getRealm()
+ Principal.REALM_SEPARATOR;
sb.append(principal_desc); sb.append(principal_desc);
} }
if (this.versioned) { if (this.versioned) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment