diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2009-02-26 19:07:58 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2009-02-26 19:07:58 +0000 |
| commit | 1b82649d84c1f1d233952625f7149d64fb68bc2b (patch) | |
| tree | 6cbe05b06f3cb34ba871aba998e49df362247da1 /src | |
| parent | 05ef3b9f962c3bf5cdf3c27d87111015ddbb55e6 (diff) | |
Don't check if independent properties are set. This fixes a regression in which independent properties did not work as advertised.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/amazon/carbonado/gen/StorableGenerator.java | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java b/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java index 21af6cf..afb1a29 100644 --- a/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java +++ b/src/main/java/com/amazon/carbonado/gen/MasterStorableGenerator.java @@ -459,9 +459,12 @@ public final class MasterStorableGenerator<S extends Storable> { ordinal++;
if (property.isDerived()
- || property.isJoin() || property.isPrimaryKeyMember()
+ || property.isIndependent()
+ || property.isJoin()
+ || property.isPrimaryKeyMember()
|| property.isNullable()
- || property.isAutomatic() || property.isVersion())
+ || property.isAutomatic()
+ || property.isVersion())
{
continue;
}
diff --git a/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java b/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java index 87dede1..204508c 100644 --- a/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java +++ b/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java @@ -2338,11 +2338,11 @@ public final class StorableGenerator<S extends Storable> { private void addIsInitializedMethod
(String name, Map<String, ? extends StorableProperty<S>> properties)
{
- // Don't check Automatic properties.
+ // Don't check Automatic, Independent, or Version properties.
{
boolean cloned = false;
for (StorableProperty<S> prop : properties.values()) {
- if (prop.isAutomatic() || prop.isVersion()) {
+ if (prop.isAutomatic() || prop.isIndependent() || prop.isVersion()) {
if (!cloned) {
properties = new LinkedHashMap<String, StorableProperty<S>>(properties);
cloned = true;
|