Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: awallgren/bonecp
base: 46874dc406
...
head fork: awallgren/bonecp
compare: 47110b9b20
  • 6 commits
  • 5 files changed
  • 0 commit comments
  • 2 contributors
View
132 .idea/workspace.xml
@@ -2,46 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f516662b-3477-421e-848e-51fb88b1c37f" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/ant.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_6.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_r09.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_1_12.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_transaction_jta_1_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_8_2.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_16.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_easymock_easymock_3_0.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_3_5_2_Final.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_1.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_2_5_6_SEC02.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bonecp-hbnprovider/bonecp-provider.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bonecp-parent.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bonecp-spring/bonecp-spring.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bonecp-test-commons/bonecp-test-commons.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bonecp/bonecp.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/AbstractConnectionStrategy.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/AbstractConnectionStrategy.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp-hbnprovider/bonecp-provider.iml" afterPath="$PROJECT_DIR$/bonecp-hbnprovider/bonecp-provider.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp-spring/bonecp-spring.iml" afterPath="$PROJECT_DIR$/bonecp-spring/bonecp-spring.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/bonecp.iml" afterPath="$PROJECT_DIR$/bonecp/bonecp.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/CachedConnectionStrategy.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/CachedConnectionStrategy.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/ConnectionHandle.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/ConnectionHandle.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/ConnectionStrategy.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/ConnectionStrategy.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/DefaultConnectionStrategy.java" afterPath="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/DefaultConnectionStrategy.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/main/resources/bonecp-default-config.xml" afterPath="$PROJECT_DIR$/bonecp/src/main/resources/bonecp-default-config.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestConnectionHandle.java" afterPath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestConnectionHandle.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestPoolWatchThread.java" afterPath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestPoolWatchThread.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestSystemTests.java" afterPath="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestSystemTests.java" />
</list>
<ignored path="bonecp-parent.iws" />
<ignored path=".idea/workspace.xml" />
@@ -133,10 +97,46 @@
</provider>
</entry>
</file>
- <file leaf-file-name="DefaultConnectionStrategy.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="DefaultConnectionStrategy.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/DefaultConnectionStrategy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="13" selection-start="919" selection-end="919" vertical-scroll-proportion="0.33261105">
+ <state line="27" column="13" selection-start="919" selection-end="919" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="BoneCP.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="444" column="5" selection-start="18503" selection-end="18503" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="BoneCPConfig.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCPConfig.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="349" column="16" selection-start="13231" selection-end="13231" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="BoneCPDataSource.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCPDataSource.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="13" selection-start="1416" selection-end="1416" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="LIFOQueue.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/LIFOQueue.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="43" column="13" selection-start="1290" selection-end="1290" vertical-scroll-proportion="-1.4873097">
<folding />
</state>
</provider>
@@ -153,6 +153,11 @@
</file>
</leaf>
</component>
+ <component name="FindManager">
+ <FindUsagesManager>
+ <setting name="OPEN_NEW_TAB" value="false" />
+ </FindUsagesManager>
+ </component>
<component name="Git.Settings">
<option name="CHECKOUT_INCLUDE_TAGS" value="false" />
<option name="UPDATE_CHANGES_POLICY" value="STASH" />
@@ -160,7 +165,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java" />
<option value="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestSystemTests.java" />
<option value="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestPoolWatchThread.java" />
<option value="$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestConnectionHandle.java" />
@@ -169,6 +173,7 @@
<option value="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/CachedConnectionStrategy.java" />
<option value="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/ConnectionStrategy.java" />
<option value="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/DefaultConnectionStrategy.java" />
+ <option value="$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java" />
</list>
</option>
</component>
@@ -332,25 +337,25 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<window_info id="Data Sources" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329294" sideWeight="0.67098165" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Phing Build" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32982087" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32901832" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32552084" sideWeight="0.5922023" order="1" side_tool="true" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32552084" sideWeight="0.6701791" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329294" sideWeight="0.39936775" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -403,13 +408,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="526" column="8" selection-start="21456" selection-end="21456" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/bonecp/src/test/java/com/jolbox/bonecp/TestSystemTests.java">
<provider selected="true" editor-type-id="text-editor">
<state line="386" column="8" selection-start="12296" selection-end="12296" vertical-scroll-proportion="0.0">
@@ -467,7 +465,35 @@
</entry>
<entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/DefaultConnectionStrategy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="13" selection-start="919" selection-end="919" vertical-scroll-proportion="0.33261105">
+ <state line="27" column="13" selection-start="919" selection-end="919" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="444" column="5" selection-start="18503" selection-end="18503" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCPConfig.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="349" column="16" selection-start="13231" selection-end="13231" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/BoneCPDataSource.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="13" selection-start="1416" selection-end="1416" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bonecp/src/main/java/com/jolbox/bonecp/LIFOQueue.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="43" column="13" selection-start="1290" selection-end="1290" vertical-scroll-proportion="-1.4873097">
<folding />
</state>
</provider>
View
5 bonecp-hbnprovider/bonecp-provider.iml
@@ -7,8 +7,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/osgi" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
View
5 bonecp-spring/bonecp-spring.iml
@@ -7,8 +7,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/osgi" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
View
2  bonecp/bonecp.iml
@@ -10,7 +10,9 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/osgi" />
<excludeFolder url="file://$MODULE_DIR$/target/surefire" />
<excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
View
4 bonecp/src/main/java/com/jolbox/bonecp/BoneCP.java
@@ -338,9 +338,9 @@ public BoneCP(BoneCPConfig config) throws SQLException {
if (config.getConnectionHook() != null){
config.getConnectionHook().onAcquireFail(e, acquireConfig);
}
- // #ifdef JDK6
+// #ifdef JDK6
throw new SQLException(String.format(ERROR_TEST_CONNECTION, config.getJdbcUrl(), config.getUsername(), PoolUtil.stringifyException(e)), e);
- // #endif JDK6
+// #endif JDK6
/* #ifdef JDK5
throw new SQLException(String.format(ERROR_TEST_CONNECTION, config.getJdbcUrl(), config.getUsername(), PoolUtil.stringifyException(e)));
#endif JDK5 */

No commit comments for this range

Something went wrong with that request. Please try again.