Attachment 231263 Details for Bug 379397 – diff file with proposed changes

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] diff file with proposed changes

379397.diff (text/plain), 2.64 KB, created by Tom Ware

on 2013-05-21 11:12:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Ware

Created: 2013-05-21 11:12:28 EDT

Size: 2.64 KB

patch

obsolete

> .../config/PersistenceUnitProperties.java          |   10 ++++++++++
> .../internal/jpa/EntityManagerSetupImpl.java       |    5 ++++-
> 2 files changed, 14 insertions(+), 1 deletions(-)
>
>diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>index 7983c2f..54778ff 100644
>--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java
>@@ -456,6 +456,16 @@ public class PersistenceUnitProperties {
>     public static final String CONNECTION_POOL_SEQUENCE = "eclipselink.connection-pool.sequence.";
>     
>     /**
>+     * Tell EclipseLink to use it's internal connection pool to pool connections from a datasource.
>+     * 
>+     * This property is useful when using EclipseLink with Gemini JPA because it internally wraps local
>+     * database information in a datasource.
>+     * 
>+     * Default: false
>+     */
>+    public static final String CONNECTION_POOL_INTERNALLY_POOL_DATASOURCE = "eclipselink.connection-pool.force-internal-pool";
>+    
>+    /**
>      * The <code>"eclipselink.jdbc.connections.wait-timeout"</code> property
>      * which specifies the timeout time in milliseconds (ms) that will be waited
>      * for an available connection before an exception is thrown. Ignored in
>diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>index edef613..b440307 100644
>--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
>@@ -1886,7 +1886,10 @@ public class EntityManagerSetupImpl implements MetadataRefreshListener {
>                 jndiConnector = new JNDIConnector(mainDatasource);                                
>             }
>             login.setConnector(jndiConnector);
>-            login.setUsesExternalConnectionPooling(true);
>+            String useInternalConnectionPool = getConfigPropertyAsStringLogDebug(PersistenceUnitProperties.CONNECTION_POOL_INTERNALLY_POOL_DATASOURCE, m, this.session);
>+            if (!"true".equalsIgnoreCase(useInternalConnectionPool)){
>+                login.setUsesExternalConnectionPooling(true);
>+            }
>         }
> 
>         if (this.session.isServerSession()) {

Actions: View | Diff

Attachments on bug 379397: 215785 | 231263