Author: awhite
Date: Wed Sep 13 11:57:13 2006
New Revision: 443073
URL: http://svn.apache.org/viewvc?view=rev&rev=443073
Log:
Formatting.
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
(original)
+++
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
Wed Sep 13 11:57:13 2006
@@ -67,8 +67,8 @@
return discrim.getMappingRepository().getMappingDefaults().
getDiscriminatorValue(discrim, adapt);
- if (_value.length() > 0 &&
- (_value.charAt(0) == '-' || Character.isDigit(_value.charAt(0)))) {
+ if (_value.length() > 0 && (_value.charAt(0) == '-'
+ || Character.isDigit(_value.charAt(0)))) {
try {
if (_value.indexOf('.') == -1)
return new Integer(_value);
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Wed Sep 13 11:57:13 2006
@@ -1747,8 +1747,8 @@
_flags &= ~FLAG_ACTIVE;
_flags &= ~FLAG_FLUSHED;
- if (_transEventManager != null &&
- _transEventManager.hasEndListeners()) {
+ if (_transEventManager != null
+ && _transEventManager.hasEndListeners()) {
_transEventManager.fireEvent(new TransactionEvent(this,
status == Status.STATUS_COMMITTED
? TransactionEvent.AFTER_COMMIT_COMPLETE
@@ -3016,11 +3016,9 @@
StateManagerImpl sm;
for (Iterator itr = states.iterator(); itr.hasNext();) {
sm = (StateManagerImpl) itr.next();
- if (!sm.isPersistent()) {
- if (sm.getPCState() != PCState.TCLEAN)
- sm.nontransactional();
+ if (!sm.isPersistent())
itr.remove();
- } else if (!sm.getMetaData().isDetachable()) {
+ else if (!sm.getMetaData().isDetachable()) {
sm.release(true);
itr.remove();
}
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an embedded instance that is managed by a StateManager and
+ * Represents an embedded instance that is managed by a StateManager and
* may be participating in the current transaction, but has not yet been
* modified.
*
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was copied and made embedded within the
+ * Represents an instance that was copied and made embedded within the
* current transaction.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an embedded instance that has been deleted in the current
+ * Represents an embedded instance that has been deleted in the current
* transaction.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an embedded instance that is participating in the current
+ * Represents an embedded instance that is participating in the current
* transaction, and has been modified.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
Wed Sep 13 11:57:13 2006
@@ -55,13 +55,11 @@
}
PCState beforeRead(StateManagerImpl context, int field) {
- error("embed-ref", context);
- return null;
+ return error("embed-ref", context);
}
PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
- error("embed-ref", context);
- return null;
+ return error("embed-ref", context);
}
PCState beforeOptimisticWrite(StateManagerImpl context, int field,
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a hollow instance that exists in the data store, but whose
+ * Represents a hollow instance that exists in the data store, but whose
* state has not been loaded and who is not active in the current transaction
* (if any). This may be the state of instances returned on ID lookups or by
* traversing relations, and the state of persistent instances outside of
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that is participating in the current
+ * Represents a persistent instance that is participating in the current
* transaction, but has not yet been modified.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that has been deleted in the current
+ * Represents a persistent instance that has been deleted in the current
* transaction, and that has been flushed to the database.
*
* @author Patrick Linskey
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that has been deleted in the current
+ * Represents a persistent instance that has been deleted in the current
* transaction.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that is participating in the current
+ * Represents a persistent instance that is participating in the current
* transaction, and has been modified.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was made persistent, then deleted within the
+ * Represents an instance that was made persistent, then deleted within the
* current transaction.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was made persistent within the
+ * Represents an instance that was made persistent within the
* current transaction, flushed, deleted, and flushed.
*
* @author Patrick Linskey
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was made persistent within the
+ * Represents an instance that was made persistent within the
* current transaction, flushed, and subsequently deleted.
*
* @author Patrick Linskey
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was made persistent within the
+ * Represents an instance that was made persistent within the
* current transaction.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was deleted outside a transaction.
+ * Represents an instance that was deleted outside a transaction.
*
* @author Steve Kim
*/
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that has been dirtied outside of
+ * Represents a persistent instance that has been dirtied outside of
* transaction. This state is only reachable only if the
* RetainNontransactional property is set.
*
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents an instance that was persisted outside a transaction.
+ * Represents an instance that was persisted outside a transaction.
*
* @author Steve Kim
*/
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
Wed Sep 13 11:57:13 2006
@@ -21,7 +21,7 @@
/**
* Lifecycle state.
- * Represents a persistent instance that is not transactional, but that
+ * Represents a persistent instance that is not transactional, but that
* allows access to persistent data. This state is reachable only if the
* RetainState property is set.
*
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a transient instance that is managed by a StateManager and
+ * Represents a transient instance that is managed by a StateManager and
* may be participating in the current transaction, but has not yet been
* modified.
*
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a transient instance that is participating in the current
+ * Represents a transient instance that is participating in the current
* transaction, and has been modified.
*
* @author Abe White
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a temporarily managed transient instance whose fields
+ * Represents a temporarily managed transient instance whose fields
* are loaded for the purpose of field inspection such
* as for cascades. This state should be released as soon as inspection
* is complete.
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
Wed Sep 13 11:57:13 2006
@@ -17,7 +17,7 @@
/**
* Lifecycle state.
- * Represents a transient instance; this state lasts only through
+ * Represents a transient instance; this state lasts only through
* the [EMAIL PROTECTED] #initialize} method, which immediately removes the
* persistence capable instance from management by the OpenJPA runtime.
*
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
Wed Sep 13 11:57:13 2006
@@ -1127,9 +1127,9 @@
public NonPersistentMetaData addNonMappedInterface(Class iface) {
if (iface == null)
return null;
+ if (!iface.isInterface())
+ throw new MetaDataException(_loc.get("not-non-mapped", iface));
synchronized(this) {
- if (!iface.isInterface())
- throw new MetaDataException(_loc.get("not-non-mapped", iface));
if (_nonMapped.containsKey(iface))
return (NonPersistentMetaData)_nonMapped.get(iface);
if (getCachedMetaData(iface) != null)
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java?view=diff&rev=443073&r1=443072&r2=443073
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
Wed Sep 13 11:57:13 2006
@@ -433,10 +433,11 @@
_attach = vmd.getCascadeAttach();
_refresh = vmd.getCascadeRefresh();
_typeOverride = vmd.getTypeOverride();
+ _serialized = vmd.isSerialized();
if (_embeddedMeta != null)
_embeddedMeta.setDescribedType(vmd.getDeclaredType());
- // don't allow copy to override embedded; don't copy serialized at all
+ // don't allow copy to override embedded
if (_embedded == null)
setEmbedded(vmd.isEmbedded());
}
