You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/19 23:35:07 UTC
svn commit: r423615 [40/44] - in /incubator/openjpa/trunk: ./
openjpa-jdbc-5/ openjpa-jdbc-5/src/ openjpa-jdbc-5/src/main/
openjpa-jdbc-5/src/main/java/ openjpa-jdbc-5/src/main/java/org/
openjpa-jdbc-5/src/main/java/org/apache/ openjpa-jdbc-5/src/main/...
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java Wed Jul 19 14:34:44 2006
@@ -98,8 +98,7 @@
public StoreContext getContext() {
try {
return _fetch.getContext();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -107,8 +106,7 @@
public void setContext(StoreContext ctx) {
try {
_fetch.setContext(ctx);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -116,8 +114,7 @@
public int getFetchBatchSize() {
try {
return _fetch.getFetchBatchSize();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -126,8 +123,7 @@
try {
_fetch.setFetchBatchSize(fetchBatchSize);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -135,8 +131,7 @@
public int getMaxFetchDepth() {
try {
return _fetch.getMaxFetchDepth();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -145,8 +140,7 @@
try {
_fetch.setMaxFetchDepth(depth);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -154,8 +148,7 @@
public Set getRootInstances() {
try {
return _fetch.getRootInstances();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -164,8 +157,7 @@
try {
_fetch.setRootInstances(roots);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -173,8 +165,7 @@
public Set getRootClasses() {
try {
return _fetch.getRootClasses();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -183,8 +174,7 @@
try {
_fetch.setRootClasses(roots);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -192,8 +182,7 @@
public boolean getQueryCache() {
try {
return _fetch.getQueryCache();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -202,8 +191,7 @@
try {
_fetch.setQueryCache(cache);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -211,8 +199,7 @@
public int getFlushBeforeQueries() {
try {
return _fetch.getFlushBeforeQueries();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -221,8 +208,7 @@
try {
_fetch.setFlushBeforeQueries(flush);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -230,8 +216,7 @@
public Set getFetchGroups() {
try {
return _fetch.getFetchGroups();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -239,8 +224,7 @@
public boolean hasFetchGroup(String group) {
try {
return _fetch.hasFetchGroup(group);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -248,8 +232,7 @@
public boolean hasFetchGroup(Set groups) {
try {
return _fetch.hasFetchGroup(groups);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -258,8 +241,7 @@
try {
_fetch.addFetchGroup(group);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -268,8 +250,7 @@
try {
_fetch.addFetchGroups(groups);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -278,8 +259,7 @@
try {
_fetch.removeFetchGroup(group);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -288,8 +268,7 @@
try {
_fetch.removeFetchGroups(groups);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -298,8 +277,7 @@
try {
_fetch.clearFetchGroups();
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -308,8 +286,7 @@
try {
_fetch.resetFetchGroups();
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -317,8 +294,7 @@
public Set getFields() {
try {
return _fetch.getFields();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -326,8 +302,7 @@
public boolean hasField(String field) {
try {
return _fetch.hasField(field);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -336,8 +311,7 @@
try {
_fetch.addField(field);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -346,8 +320,7 @@
try {
_fetch.addFields(fields);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -356,8 +329,7 @@
try {
_fetch.removeField(field);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -366,8 +338,7 @@
try {
_fetch.removeFields(fields);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -376,8 +347,7 @@
try {
_fetch.clearFields();
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -385,8 +355,7 @@
public int getLockTimeout() {
try {
return _fetch.getLockTimeout();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -395,8 +364,7 @@
try {
_fetch.setLockTimeout(timeout);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -404,8 +372,7 @@
public int getReadLockLevel() {
try {
return _fetch.getReadLockLevel();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -414,8 +381,7 @@
try {
_fetch.setReadLockLevel(level);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -423,8 +389,7 @@
public int getWriteLockLevel() {
try {
return _fetch.getWriteLockLevel();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -433,8 +398,7 @@
try {
_fetch.setWriteLockLevel(level);
return this;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -442,8 +406,7 @@
public ResultList newResultList(ResultObjectProvider rop) {
try {
return _fetch.newResultList(rop);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -451,8 +414,7 @@
public FetchState newFetchState() {
try {
return _fetch.newFetchState();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -460,8 +422,7 @@
public void copy(FetchConfiguration fetch) {
try {
_fetch.copy(fetch);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -469,8 +430,7 @@
public Object clone() {
try {
return _fetch.clone();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -478,8 +438,7 @@
public void setHint(String name, Object value) {
try {
_fetch.setHint(name, value);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -487,8 +446,7 @@
public Object getHint(String name) {
try {
return _fetch.getHint(name);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java Wed Jul 19 14:34:44 2006
@@ -98,8 +98,7 @@
public Broker getBroker() {
try {
return _query.getBroker();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -111,8 +110,7 @@
public StoreContext getStoreContext() {
try {
return _query.getStoreContext();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -120,8 +118,7 @@
public int getOperation() {
try {
return _query.getOperation();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -129,8 +126,7 @@
public String getLanguage() {
try {
return _query.getLanguage();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -138,8 +134,7 @@
public FetchConfiguration getFetchConfiguration() {
try {
return _query.getFetchConfiguration();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -147,8 +142,7 @@
public String getQueryString() {
try {
return _query.getQueryString();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -156,8 +150,7 @@
public boolean getIgnoreChanges() {
try {
return _query.getIgnoreChanges();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -165,8 +158,7 @@
public Object getCompilation() {
try {
return _query.getCompilation();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -174,8 +166,7 @@
public String getAlias() {
try {
return _query.getAlias();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -183,8 +174,7 @@
public String[] getProjectionAliases() {
try {
return _query.getProjectionAliases();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -192,8 +182,7 @@
public Class[] getProjectionTypes() {
try {
return _query.getProjectionTypes();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -201,8 +190,7 @@
public boolean isAggregate() {
try {
return _query.isAggregate();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -210,8 +198,7 @@
public boolean hasGrouping() {
try {
return _query.hasGrouping();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -219,8 +206,7 @@
public ClassMetaData[] getAccessPathMetaDatas() {
try {
return _query.getAccessPathMetaDatas();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -228,8 +214,7 @@
public FilterListener getFilterListener(String tag) {
try {
return _query.getFilterListener(tag);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -237,8 +222,7 @@
public AggregateListener getAggregateListener(String tag) {
try {
return _query.getAggregateListener(tag);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -246,8 +230,7 @@
public Collection getFilterListeners() {
try {
return _query.getFilterListeners();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -255,8 +238,7 @@
public Collection getAggregateListeners() {
try {
return _query.getAggregateListeners();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -264,8 +246,7 @@
public Collection getCandidateCollection() {
try {
return _query.getCandidateCollection();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -273,8 +254,7 @@
public Class getCandidateType() {
try {
return _query.getCandidateType();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -282,8 +262,7 @@
public boolean hasSubclasses() {
try {
return _query.hasSubclasses();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -291,8 +270,7 @@
public void setCandidateType(Class cls, boolean subs) {
try {
_query.setCandidateType(cls, subs);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -300,8 +278,7 @@
public boolean isReadOnly() {
try {
return _query.isReadOnly();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -309,8 +286,7 @@
public void setReadOnly(boolean readOnly) {
try {
_query.setReadOnly(readOnly);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -318,8 +294,7 @@
public Class getResultMappingScope() {
try {
return _query.getResultMappingScope();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -327,8 +302,7 @@
public String getResultMappingName() {
try {
return _query.getResultMappingName();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -336,8 +310,7 @@
public void setResultMapping(Class scope, String name) {
try {
_query.setResultMapping(scope, name);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -345,8 +318,7 @@
public boolean isUnique() {
try {
return _query.isUnique();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -354,8 +326,7 @@
public void setUnique(boolean unique) {
try {
_query.setUnique(unique);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -363,8 +334,7 @@
public Class getResultType() {
try {
return _query.getResultType();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -372,8 +342,7 @@
public void setResultType(Class cls) {
try {
_query.setResultType(cls);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -381,8 +350,7 @@
public long getStartRange() {
try {
return _query.getStartRange();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -390,8 +358,7 @@
public long getEndRange() {
try {
return _query.getEndRange();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -399,8 +366,7 @@
public void setRange(long start, long end) {
try {
_query.setRange(start, end);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -408,8 +374,7 @@
public String getParameterDeclaration() {
try {
return _query.getParameterDeclaration();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -417,8 +382,7 @@
public LinkedMap getParameterTypes() {
try {
return _query.getParameterTypes();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -426,8 +390,7 @@
public Map getUpdates() {
try {
return _query.getUpdates();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -435,8 +398,7 @@
public void declareParameters(String params) {
try {
_query.declareParameters(params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -444,8 +406,7 @@
public Object[] toParameterArray(LinkedMap paramTypes, Map params) {
try {
return _query.toParameterArray(paramTypes, params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -453,8 +414,7 @@
public Number deleteInMemory(StoreQuery.Executor ex, Object[] params) {
try {
return _query.deleteInMemory(ex, params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -462,8 +422,7 @@
public Number updateInMemory(StoreQuery.Executor ex, Object[] params) {
try {
return _query.updateInMemory(ex, params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -471,8 +430,7 @@
public Class classForName(String name, String[] imports) {
try {
return _query.classForName(name, imports);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -480,8 +438,7 @@
public void lock() {
try {
_query.lock();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -489,8 +446,7 @@
public void unlock() {
try {
_query.unlock();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -498,8 +454,7 @@
public void addFilterListener(FilterListener listener) {
try {
_query.addFilterListener(listener);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -507,8 +462,7 @@
public void removeFilterListener(FilterListener listener) {
try {
_query.removeFilterListener(listener);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -516,8 +470,7 @@
public void addAggregateListener(AggregateListener listener) {
try {
_query.addAggregateListener(listener);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -525,8 +478,7 @@
public void removeAggregateListener(AggregateListener listener) {
try {
_query.removeAggregateListener(listener);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -534,8 +486,7 @@
public Extent getCandidateExtent() {
try {
return _query.getCandidateExtent();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -543,8 +494,7 @@
public void setCandidateExtent(Extent extent) {
try {
_query.setCandidateExtent(extent);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -552,8 +502,7 @@
public void setCandidateCollection(Collection coll) {
try {
_query.setCandidateCollection(coll);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -561,8 +510,7 @@
public void compile() {
try {
_query.compile();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -570,8 +518,7 @@
public Object execute() {
try {
return _query.execute();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -579,8 +526,7 @@
public Object execute(Map params) {
try {
return _query.execute(params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -588,8 +534,7 @@
public Object execute(Object[] params) {
try {
return _query.execute(params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -597,8 +542,7 @@
public long deleteAll() {
try {
return _query.deleteAll();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -606,8 +550,7 @@
public long deleteAll(Object[] parameters) {
try {
return _query.deleteAll(parameters);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -615,8 +558,7 @@
public long deleteAll(Map parameterMap) {
try {
return _query.deleteAll(parameterMap);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -624,8 +566,7 @@
public long updateAll() {
try {
return _query.updateAll();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -633,8 +574,7 @@
public long updateAll(Object[] parameters) {
try {
return _query.updateAll(parameters);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -642,8 +582,7 @@
public long updateAll(Map parameterMap) {
try {
return _query.updateAll(parameterMap);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -651,8 +590,7 @@
public void closeAll() {
try {
_query.closeAll();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -660,8 +598,7 @@
public void closeResources() {
try {
_query.closeResources();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -669,8 +606,7 @@
public String[] getDataStoreActions(Map params) {
try {
return _query.getDataStoreActions(params);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -678,8 +614,7 @@
public boolean setQuery(Object query) {
try {
return _query.setQuery(query);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -687,8 +622,7 @@
public void setIgnoreChanges(boolean ignore) {
try {
_query.setIgnoreChanges(ignore);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -696,8 +630,7 @@
public void assertOpen() {
try {
_query.assertOpen();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -705,8 +638,7 @@
public void assertNotReadOnly() {
try {
_query.assertNotReadOnly();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -714,8 +646,7 @@
public void assertNotSerialized() {
try {
_query.assertNotSerialized();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java Wed Jul 19 14:34:44 2006
@@ -80,8 +80,7 @@
public int hashCode() {
try {
return getInnermostDelegate().hashCode();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -93,8 +92,7 @@
other = ((DelegatingResultList) other).getInnermostDelegate();
try {
return getInnermostDelegate().equals(other);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -109,8 +107,7 @@
public boolean isProviderOpen() {
try {
return _del.isProviderOpen();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -118,8 +115,7 @@
public void close() {
try {
_del.close();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -127,8 +123,7 @@
public boolean isClosed() {
try {
return _del.isClosed();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -136,8 +131,7 @@
public int size() {
try {
return _del.size();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -145,8 +139,7 @@
public boolean isEmpty() {
try {
return _del.isEmpty();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -154,8 +147,7 @@
public boolean contains(Object o) {
try {
return _del.contains(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -167,8 +159,7 @@
public Object[] toArray() {
try {
return _del.toArray();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -176,8 +167,7 @@
public Object[] toArray(Object[] a) {
try {
return _del.toArray(a);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -185,8 +175,7 @@
public boolean add(Object o) {
try {
return _del.add(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -194,8 +183,7 @@
public boolean remove(Object o) {
try {
return _del.remove(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -203,8 +191,7 @@
public boolean containsAll(Collection c) {
try {
return _del.containsAll(c);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -212,8 +199,7 @@
public boolean addAll(Collection c) {
try {
return _del.addAll(c);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -221,8 +207,7 @@
public boolean addAll(int index, Collection c) {
try {
return _del.addAll(index, c);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -230,8 +215,7 @@
public boolean removeAll(Collection c) {
try {
return _del.removeAll(c);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -239,8 +223,7 @@
public boolean retainAll(Collection c) {
try {
return _del.retainAll(c);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -248,8 +231,7 @@
public void clear() {
try {
_del.clear();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -257,8 +239,7 @@
public Object get(int index) {
try {
return _del.get(index);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -266,8 +247,7 @@
public Object set(int index, Object element) {
try {
return _del.set(index, element);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -275,8 +255,7 @@
public void add(int index, Object element) {
try {
_del.add(index, element);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -284,8 +263,7 @@
public Object remove(int index) {
try {
return _del.remove(index);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -293,8 +271,7 @@
public int indexOf(Object o) {
try {
return _del.indexOf(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -302,8 +279,7 @@
public int lastIndexOf(Object o) {
try {
return _del.lastIndexOf(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -311,8 +287,7 @@
public ListIterator listIterator() {
try {
return new DelegatingListIterator(_del.listIterator());
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -320,8 +295,7 @@
public ListIterator listIterator(int index) {
try {
return new DelegatingListIterator(_del.listIterator(index));
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -329,8 +303,7 @@
public List subList(int fromIndex, int toIndex) {
try {
return _del.subList(fromIndex, toIndex);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -368,8 +341,7 @@
public int hashCode() {
try {
return getInnermostDelegate().hashCode();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -382,8 +354,7 @@
getInnermostDelegate();
try {
return getInnermostDelegate().equals(other);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -391,8 +362,7 @@
public boolean hasNext() {
try {
return _del.hasNext();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -400,8 +370,7 @@
public Object next() {
try {
return _del.next();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -409,8 +378,7 @@
public boolean hasPrevious() {
try {
return _del.hasPrevious();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -418,8 +386,7 @@
public Object previous() {
try {
return _del.previous();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -427,8 +394,7 @@
public int nextIndex() {
try {
return _del.nextIndex();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -436,8 +402,7 @@
public int previousIndex() {
try {
return _del.previousIndex();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -445,8 +410,7 @@
public void remove() {
try {
_del.remove();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -454,8 +418,7 @@
public void set(Object o) {
try {
_del.set(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -463,8 +426,7 @@
public void add(Object o) {
try {
_del.add(o);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate (re);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java Wed Jul 19 14:34:44 2006
@@ -92,8 +92,7 @@
public void setType(int type) {
try {
_seq.setType(type);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -101,8 +100,7 @@
public Object next(StoreContext ctx, ClassMetaData meta) {
try {
return _seq.next(ctx, meta);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -110,8 +108,7 @@
public Object current(StoreContext ctx, ClassMetaData meta) {
try {
return _seq.current(ctx, meta);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -119,8 +116,7 @@
public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
try {
_seq.allocate(additional, ctx, meta);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -128,8 +124,7 @@
public void close() {
try {
_seq.close();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java Wed Jul 19 14:34:44 2006
@@ -267,12 +267,10 @@
CallbackException excep = null;
try {
return detachInternal(toDetach);
- }
- catch (CallbackException ce) {
+ } catch (CallbackException ce) {
excep = ce;
return null; // won't be reached as exception will be rethrown
- }
- finally {
+ } finally {
List exceps = null;
if (excep == null || !_failFast) {
@@ -309,8 +307,7 @@
if (re instanceof CallbackException && _failFast)
failFast = true;
exceps = add(exceps, re);
- }
- finally {
+ } finally {
// invoke post callbacks unless all failed
if (!failFast && (exceps == null
|| exceps.size() < instances.size())) {
@@ -353,8 +350,7 @@
if (sm != null)
_broker.fireLifecycleEvent(detached, orig,
sm.getMetaData(), LifecycleEvent.AFTER_DETACH);
- }
- catch (CallbackException ce) {
+ } catch (CallbackException ce) {
exceps = add(exceps, ce);
if (_failFast)
break; // don't continue processing
@@ -594,8 +590,7 @@
for (int i = 0; i < fmds.length; i++)
if (!fmds[i].isPrimaryKey() && !fmds[i].isVersion())
detachField(from, i, fgfields.get(i));
- }
- finally {
+ } finally {
// clear the StateManager from the target object
if (_copy)
_to.pcReplaceStateManager(null);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java Wed Jul 19 14:34:44 2006
@@ -400,8 +400,7 @@
if (objval instanceof Proxy)
((Proxy) objval).setOwner(this, idx);
objval = null;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -416,8 +415,7 @@
_dirty.set(idx);
longval = next ? 1 : 0;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -432,8 +430,7 @@
_dirty.set(idx);
longval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -448,8 +445,7 @@
_dirty.set(idx);
longval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -464,8 +460,7 @@
_dirty.set(idx);
longval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -480,8 +475,7 @@
_dirty.set(idx);
longval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -496,8 +490,7 @@
_dirty.set(idx);
longval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -512,8 +505,7 @@
_dirty.set(idx);
dblval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -528,8 +520,7 @@
_dirty.set(idx);
dblval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -544,8 +535,7 @@
_dirty.set(idx);
objval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
objval = null;
}
@@ -561,8 +551,7 @@
_dirty.set(idx);
objval = next;
pc.pcReplaceField(idx);
- }
- finally {
+ } finally {
unlock();
objval = null;
}
@@ -808,8 +797,7 @@
lock();
try {
_dirty.set(field);
- }
- finally {
+ } finally {
unlock();
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java Wed Jul 19 14:34:44 2006
@@ -98,8 +98,7 @@
while (itr.hasNext())
list.add(itr.next());
return list;
- }
- finally {
+ } finally {
ImplHelper.close(itr);
}
}
@@ -144,11 +143,9 @@
else
citr = chain;
citr.setRemoveOnClose(this);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw new GeneralException(re);
}
@@ -157,8 +154,7 @@
if (_openItrs == null)
_openItrs = new ReferenceHashSet(ReferenceHashSet.WEAK);
_openItrs.add(citr);
- }
- finally {
+ } finally {
unlock();
}
return citr;
@@ -192,14 +188,11 @@
}
}
_openItrs.clear();
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw new GeneralException(re);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -260,8 +253,7 @@
_extent.lock();
try {
_extent._openItrs.remove(this);
- }
- finally {
+ } finally {
_extent.unlock();
}
}
@@ -311,8 +303,7 @@
_extent.lock();
try {
_extent._openItrs.remove(this);
- }
- finally {
+ } finally {
_extent.unlock();
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java Wed Jul 19 14:34:44 2006
@@ -709,8 +709,7 @@
try {
return (AggregateListener) Class.forName((String) hint, true,
loader).newInstance();
- }
- catch (Exception e) {
+ } catch (Exception e) {
cause = e;
}
}
@@ -746,8 +745,7 @@
aggs[i] = (AggregateListener) Class.forName(clss[i], true,
loader).newInstance();
return aggs;
- }
- catch (Exception e) {
+ } catch (Exception e) {
cause = e;
}
}
@@ -771,8 +769,7 @@
try {
return (FilterListener) Class.forName((String) hint, true,
loader).newInstance();
- }
- catch (Exception e) {
+ } catch (Exception e) {
cause = e;
}
}
@@ -807,8 +804,7 @@
filts[i] = (FilterListener) Class.forName(clss[i], true,
loader).newInstance();
return filts;
- }
- catch (Exception e) {
+ } catch (Exception e) {
cause = e;
}
}
@@ -826,8 +822,7 @@
Method getter = ImplHelper.getGetter(target.getClass(), hintKey);
try {
return getter.invoke(target, (Object[]) null);
- }
- catch (Exception e) {
+ } catch (Exception e) {
Throwable t = e;
if (e instanceof InvocationTargetException)
t = ((InvocationTargetException) e).getTargetException();
@@ -854,8 +849,7 @@
setter.getParameterTypes()[0]);
}
setter.invoke(target, new Object[]{ value });
- }
- catch (Exception e) {
+ } catch (Exception e) {
Throwable t = e;
if (e instanceof InvocationTargetException)
t = ((InvocationTargetException) e).getTargetException();
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java Wed Jul 19 14:34:44 2006
@@ -76,8 +76,7 @@
_broker.beforeCompletion();
if (_factorySync != null)
_factorySync.beforeCompletion();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
_rollbackOnly = true;
err = re;
}
@@ -89,8 +88,7 @@
try {
_broker.afterCompletion(Status.STATUS_COMMITTED);
notifyAfterCompletion(Status.STATUS_COMMITTED);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
if (err == null)
err = re;
}
@@ -100,8 +98,7 @@
if (_active) {
try {
rollback();
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
if (err == null)
err = re;
}
@@ -120,16 +117,14 @@
RuntimeException err = null;
try {
_broker.afterCompletion(Status.STATUS_ROLLEDBACK);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
err = re;
}
// rollback synch, even if broker throws exception
try {
notifyAfterCompletion(Status.STATUS_ROLLEDBACK);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
if (err == null)
err = re;
}
@@ -149,8 +144,7 @@
try {
if (_factorySync != null)
_factorySync.afterCompletion(status);
- }
- finally {
+ } finally {
_rollbackOnly = false;
_factorySync = null;
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java Wed Jul 19 14:34:44 2006
@@ -109,8 +109,7 @@
_params.put(decs.get(i + 1), cls);
}
return _params;
- }
- finally {
+ } finally {
ctx.unlock();
}
}
@@ -229,8 +228,7 @@
Class[] types = (_inMem) ? ARGS_INMEM : ARGS_DATASTORE;
try {
meth = cls.getMethod(methName, types);
- }
- catch (Exception e) {
+ } catch (Exception e) {
String msg = (_inMem) ? "bad-inmem-method"
: "bad-datastore-method";
throw new UserException(_loc.get(msg, methName, cls));
@@ -243,11 +241,9 @@
try {
return meth.invoke(null, args);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(_loc.get("method-error", _meth,
Exceptions.toString(Arrays.asList(args))), e);
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java Wed Jul 19 14:34:44 2006
@@ -697,14 +697,12 @@
try {
meth = _oid.getClass().getMethod("get"
+ StringUtils.capitalize(fmd.getName()), (Class[]) null);
- }
- catch (NoSuchMethodException nsme) {
+ } catch (NoSuchMethodException nsme) {
meth = _oid.getClass().getMethod("is"
+ StringUtils.capitalize(fmd.getName()), (Class[]) null);
}
return meth.invoke(_oid, (Object[]) null);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new GeneralException(e);
}
}
@@ -718,8 +716,7 @@
if (_oid == null && forceInst) {
try {
_oid = getMetaData().getDescribedType().newInstance();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new GeneralException(e);
}
} else if (_oid == null)
@@ -736,8 +733,7 @@
_oid.getClass().getMethod("set" + StringUtils.capitalize
(fmd.getName()), new Class[]{ fmd.getDeclaredType() }).
invoke(_oid, new Object[]{ val });
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new GeneralException(e);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Wed Jul 19 14:34:44 2006
@@ -164,8 +164,7 @@
assertOpen();
// allowed modification: no read-only check
_ignoreChanges = flag;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -180,8 +179,7 @@
try {
assertOpen();
_readOnly = flag;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -194,8 +192,7 @@
if (_filtListeners == null)
_filtListeners = new HashMap(5);
_filtListeners.put(listener.getTag(), listener);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -207,8 +204,7 @@
assertNotReadOnly();
if (_filtListeners != null)
_filtListeners.remove(listener.getTag());
- }
- finally {
+ } finally {
unlock();
}
}
@@ -245,8 +241,7 @@
if (_aggListeners == null)
_aggListeners = new HashMap(5);
_aggListeners.put(listener.getTag(), listener);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -258,8 +253,7 @@
assertNotReadOnly();
if (_aggListeners != null)
_aggListeners.remove(listener.getTag());
- }
- finally {
+ } finally {
unlock();
}
}
@@ -308,8 +302,7 @@
_extent.setIgnoreChanges(_ignoreChanges);
}
return _extent;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -343,8 +336,7 @@
}
if (invalidate)
invalidateCompilation();
- }
- finally {
+ } finally {
unlock();
}
}
@@ -367,8 +359,7 @@
_collection = candidateCollection;
if (_collection != null)
_extent = null;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -384,8 +375,7 @@
// check again after compilation; maybe encoded in string
compileForCompilation();
return _class;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -399,8 +389,7 @@
_subclasses = subs;
_loader = null;
invalidateCompilation();
- }
- finally {
+ } finally {
unlock();
}
}
@@ -426,8 +415,7 @@
_resultMappingScope = scope;
_resultMappingName = name;
_packer = null;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -453,8 +441,7 @@
if (!ex.isAggregate(_storeQuery))
return false;
return !ex.hasGrouping(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -465,8 +452,7 @@
assertOpen();
assertNotReadOnly();
_unique = (unique) ? Boolean.TRUE : Boolean.FALSE;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -482,8 +468,7 @@
// check again after compilation; maybe encoded in string
compileForCompilation();
return _resultClass;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -495,8 +480,7 @@
// allowed modification: no read-only check
_resultClass = cls;
_packer = null;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -512,8 +496,7 @@
// check again after compilation; maybe encoded in string
compileForCompilation();
return _startIdx;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -529,8 +512,7 @@
// check again after compilation; maybe encoded in string
compileForCompilation();
return _endIdx;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -550,8 +532,7 @@
// allowed modification: no read-only check
_startIdx = start;
_endIdx = end;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -566,8 +547,7 @@
compileForCompilation();
return _params;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -587,8 +567,7 @@
params = null;
_params = params;
invalidateCompilation();
- }
- finally {
+ } finally {
unlock();
}
}
@@ -598,8 +577,7 @@
try {
assertOpen();
getResultPacker(compileForExecutor());
- }
- finally {
+ } finally {
unlock();
}
}
@@ -620,14 +598,11 @@
try {
_compiled = newCompilation();
return _compiled;
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw new GeneralException(re);
- }
- finally {
+ } finally {
_compiling = false;
_readOnly = readOnly;
}
@@ -727,11 +702,9 @@
es[i] = _storeQuery.newDataStoreExecutor(metas[i], true);
}
return new MergedExecutor(es, this);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw new GeneralException(re);
}
}
@@ -794,14 +767,11 @@
if (operation == OP_UPDATE)
return update(ex, params);
throw new UnsupportedException();
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(e);
- }
- finally {
+ } finally {
_broker.endOperation();
}
}
@@ -838,14 +808,11 @@
if (operation == OP_UPDATE)
return update(ex, params);
throw new UnsupportedException();
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(e);
- }
- finally {
+ } finally {
_broker.endOperation();
}
}
@@ -981,8 +948,7 @@
_startIdx, _endIdx);
try {
return toResult(ex, rop, lrs);
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (rop != null)
try {
rop.close();
@@ -1011,8 +977,7 @@
_startIdx, _endIdx);
try {
return toResult(ex, rop, lrs);
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (rop != null)
try {
rop.close();
@@ -1059,11 +1024,9 @@
for (Iterator i = ((Collection) o).iterator(); i.hasNext(); size++)
_broker.delete(i.next(), null);
return Numbers.valueOf(size);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(e);
}
}
@@ -1105,11 +1068,9 @@
for (Iterator i = ((Collection) o).iterator(); i.hasNext(); size++)
updateInMemory(i.next(), params);
return Numbers.valueOf(size);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(e);
}
}
@@ -1348,8 +1309,7 @@
// return single result
return single;
- }
- finally {
+ } finally {
rop.close();
}
}
@@ -1423,8 +1383,7 @@
res.close(false);
}
_resultLists.clear();
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1443,14 +1402,11 @@
Object[] arr = toParameterArray(ex.getParameterTypes(_storeQuery),
params);
return ex.getDataStoreActions(_storeQuery, arr, _startIdx, _endIdx);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(e);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1492,8 +1448,7 @@
if (q._aggListeners != null)
_aggListeners = new HashMap(q._aggListeners);
return true;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1505,8 +1460,7 @@
if (alias == null)
alias = Strings.getClassName(_class);
return alias;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1515,8 +1469,7 @@
lock();
try {
return compileForExecutor().getProjectionAliases(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1525,8 +1478,7 @@
lock();
try {
return compileForExecutor().getProjectionTypes(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1535,8 +1487,7 @@
lock();
try {
return compileForExecutor().getOperation(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1545,8 +1496,7 @@
lock();
try {
return compileForExecutor().isAggregate(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1555,8 +1505,7 @@
lock();
try {
return compileForExecutor().hasGrouping(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1567,8 +1516,7 @@
ClassMetaData[] metas = compileForExecutor().
getAccessPathMetaDatas(_storeQuery);
return (metas == null) ? StoreQuery.EMPTY_METAS : metas;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1577,8 +1525,7 @@
lock();
try {
return compileForExecutor().getParameterTypes(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1587,8 +1534,7 @@
lock();
try {
return compileForExecutor().getUpdates(_storeQuery);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1607,8 +1553,7 @@
lock();
try {
return compileForCompilation().storeData;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1677,10 +1622,8 @@
getClassLoader(_class, _broker.getClassLoader());
try {
return Strings.toClass(name, _loader);
- }
- catch (RuntimeException re) {
- }
- catch (NoClassDefFoundError ncdfe) {
+ } catch (RuntimeException re) {
+ } catch (NoClassDefFoundError ncdfe) {
}
return null;
}
@@ -2127,8 +2070,7 @@
break;
}
}
- }
- finally {
+ } finally {
unlock();
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java Wed Jul 19 14:34:44 2006
@@ -43,11 +43,9 @@
ExpressionParser ep;
try {
ep = (ExpressionParser) classes[i].newInstance();
- }
- catch (InstantiationException e) {
+ } catch (InstantiationException e) {
throw new InternalException(e);
- }
- catch (IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
throw new InternalException(e);
}
_expressionParsers.put(ep.getLanguage(), ep);
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java Wed Jul 19 14:34:44 2006
@@ -45,11 +45,9 @@
try {
((PCResultObjectProvider) context).initialize
(sm, state, fetchState);
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new StoreException(e);
}
return true;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java Wed Jul 19 14:34:44 2006
@@ -113,8 +113,7 @@
if (types != null && types.length > 0) {
try {
cons = _resultClass.getConstructor(types);
- }
- catch (NoSuchMethodException nsme) {
+ } catch (NoSuchMethodException nsme) {
}
}
_constructor = cons;
@@ -243,15 +242,12 @@
}
}
return user;
- }
- catch (OpenJPAException ke) {
+ } catch (OpenJPAException ke) {
throw ke;
- }
- catch (InstantiationException ie) {
+ } catch (InstantiationException ie) {
throw new UserException(_loc.get("pack-instantiation-err",
_resultClass), ie);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UserException(_loc.get("pack-err", _resultClass), e);
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=423615&r1=423614&r2=423615&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Wed Jul 19 14:34:44 2006
@@ -216,8 +216,7 @@
_state.initialize(this);
if (_state.isDeleted() && !wasDeleted)
fireLifecycleEvent(LifecycleEvent.AFTER_DELETE);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -463,8 +462,7 @@
lock();
try {
return assignObjectId(flush, false);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -509,8 +507,7 @@
try {
_broker.setStateManager(orig, this,
BrokerImpl.STATUS_OID_ASSIGN);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
_id = orig;
_oid = null;
throw re;
@@ -769,8 +766,7 @@
provideField(_saved.getState(), _single, field);
return fetchField(_single, fmd);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -814,8 +810,7 @@
storeField(field, value, _single);
replaceField(_pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1025,8 +1020,7 @@
setPCState(PCState.TRANSIENT);
else
setPCState(_state.release(this));
- }
- finally {
+ } finally {
_flags &= ~FLAG_NO_UNPROXY;
}
}
@@ -1093,8 +1087,7 @@
return true;
}
return false;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1113,8 +1106,7 @@
setPCState(_state.afterOptimisticRefresh());
else
setPCState(_state.afterRefresh());
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1221,8 +1213,7 @@
load(_broker.getFetchConfiguration().newFetchState(),
LOAD_SERIALIZE, null, null, false);
return false;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -1245,11 +1236,9 @@
_single.clear();
}
return true;
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
- }
- finally {
+ } finally {
_flags &= ~FLAG_DETACHING;
unlock();
}
@@ -1304,8 +1293,7 @@
if (_meta.getIdentityType() == ClassMetaData.ID_DATASTORE)
return _broker.getStoreManager().copyDataStoreId(_oid, _meta);
return ApplicationIds.copy(_oid, _meta);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -1325,8 +1313,7 @@
try {
beforeRead(field);
beforeAccessField(field);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -1344,11 +1331,9 @@
else
assignField(field, false);
obtainLocks(active, false, lockLevel, null, null);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1467,11 +1452,9 @@
loadField(field, lockLevel, true, true);
}
obtainLocks(active, true, lockLevel, null, null);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
- }
- finally {
+ } finally {
if (locked)
unlock();
}
@@ -1510,8 +1493,7 @@
_single.delete(vmd, removed, null);
else if (vmd.getCascadeDelete() == ValueMetaData.CASCADE_AUTO)
_single.dereferenceDependent(removed);
- }
- catch (RuntimeException re) {
+ } catch (RuntimeException re) {
throw translate(re);
}
}
@@ -1573,8 +1555,7 @@
boolean ret = _single.isDefaultValue();
_single.clear();
return ret;
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1597,8 +1578,7 @@
_single.storeBooleanField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1617,8 +1597,7 @@
_single.storeByteField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1637,8 +1616,7 @@
_single.storeCharField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1657,8 +1635,7 @@
_single.storeDoubleField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1677,8 +1654,7 @@
_single.storeFloatField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1697,8 +1673,7 @@
_single.storeIntField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1717,8 +1692,7 @@
_single.storeLongField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1772,8 +1746,7 @@
_single.storeObjectField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1792,8 +1765,7 @@
_single.storeShortField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1812,8 +1784,7 @@
_single.storeStringField(field, newVal);
replaceField(pc, _single, field);
postDirty(stat);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1954,8 +1925,7 @@
provideField(_pc, _single, field);
return _single.fetchBooleanField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -1977,8 +1947,7 @@
provideField(_pc, _single, field);
return _single.fetchByteField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2000,8 +1969,7 @@
provideField(_pc, _single, field);
return _single.fetchCharField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2023,8 +1991,7 @@
provideField(_pc, _single, field);
return _single.fetchDoubleField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2046,8 +2013,7 @@
provideField(_pc, _single, field);
return _single.fetchFloatField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2069,8 +2035,7 @@
provideField(_pc, _single, field);
return _single.fetchIntField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2092,8 +2057,7 @@
provideField(_pc, _single, field);
return _single.fetchLongField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2115,8 +2079,7 @@
provideField(_pc, _single, field);
return _single.fetchObjectField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2138,8 +2101,7 @@
provideField(_pc, _single, field);
return _single.fetchShortField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2161,8 +2123,7 @@
provideField(_pc, _single, field);
return _single.fetchStringField(field);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2184,8 +2145,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2206,8 +2166,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2228,8 +2187,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2250,8 +2208,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2272,8 +2229,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2294,8 +2250,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2316,8 +2271,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2339,8 +2293,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2361,8 +2314,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2382,8 +2334,7 @@
replaceField(_pc, _single, field);
setLoaded(field, true);
postLoad(field, null);
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2523,8 +2474,7 @@
_loadVersion = null;
if (_fieldImpl != null)
Arrays.fill(_fieldImpl, null);
- }
- finally {
+ } finally {
unlock();
}
@@ -2644,8 +2594,7 @@
_single.clear();
}
}
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2696,8 +2645,7 @@
_single.clear();
}
}
- }
- finally {
+ } finally {
unlock();
}
}
@@ -2713,8 +2661,7 @@
_flags |= FLAG_PRE_DELETING;
try {
fireLifecycleEvent(LifecycleEvent.BEFORE_DELETE);
- }
- finally {
+ } finally {
_flags &= ~FLAG_PRE_DELETING;
}
}