diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java b/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
index 98f425de18..b6837e56b8 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
@@ -1,4 +1,4 @@
-/* Copyright 2004 Acegi Technology Pty Limited
+/* Copyright 2004, 2005 Acegi Technology Pty Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -76,7 +76,13 @@ public abstract class AbstractBasicAclEntry implements BasicAclEntry {
this.mask = mask;
}
- protected AbstractBasicAclEntry() {}
+ /**
+ * A protected constructor for use by Hibernate.
+ */
+ protected AbstractBasicAclEntry() {
+ validPermissions = getValidPermissions();
+ Arrays.sort(validPermissions);
+ }
//~ Methods ================================================================
diff --git a/doc/xdocs/changes.xml b/doc/xdocs/changes.xml
index ef08df12e6..6563626af0 100644
--- a/doc/xdocs/changes.xml
+++ b/doc/xdocs/changes.xml
@@ -29,6 +29,7 @@
SecurityEnforcementFilter caused NullPointerException when anonymous authentication used with BasicProcessingFilterEntryPoint
FilterChainProxy now supports replacement of ServletRequest and ServetResponse by Filter beans
ContextHolderAwareRequestWrapper methods returns null if user is anonymous
+ AbstractBasicAclEntry improved compatibility with Hibernate
Added Digest Authentication support (RFC 2617 and RFC 2069)