You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/03/31 13:28:41 UTC
svn commit: r1737228 - in /openmeetings/application: branches/3.1.x/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/
branches/3.1.x/openmeetings-db/ trunk/
trunk/openmeetings-core/src/main/java/org/apache/open...
Author: solomax
Date: Thu Mar 31 11:28:41 2016
New Revision: 1737228
URL: http://svn.apache.org/viewvc?rev=1737228&view=rev
Log:
[OPENMEETINGS-1350] cluster should be fixed
Modified:
openmeetings/application/branches/3.1.x/LICENSE
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/application/branches/3.1.x/openmeetings-db/pom.xml
openmeetings/application/trunk/LICENSE
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/application/trunk/openmeetings-db/pom.xml
Modified: openmeetings/application/branches/3.1.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/LICENSE?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/LICENSE (original)
+++ openmeetings/application/branches/3.1.x/LICENSE Thu Mar 31 11:28:41 2016
@@ -329,6 +329,7 @@ webapps/openmeetings/WEB-INF/lib/commons
webapps/openmeetings/WEB-INF/lib/commons-collections4-4.1.jar
webapps/openmeetings/WEB-INF/lib/commons-dbcp2-2.1.1.jar
webapps/openmeetings/WEB-INF/lib/commons-lang-2.4.jar
+webapps/openmeetings/WEB-INF/lib/commons-pool-1.6.jar
webapps/openmeetings/WEB-INF/lib/commons-pool2-2.4.2.jar
webapps/openmeetings/WEB-INF/lib/commons-transaction-1.2.jar
webapps/openmeetings/WEB-INF/lib/cxf-core-3.1.5.jar
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java Thu Mar 31 11:28:41 2016
@@ -42,7 +42,7 @@ public class DatabaseStore implements IC
}
public void put(String streamId, Client rcl) {
- if (rcl.getId() > 0) {
+ if (rcl.getId() != null) {
clientDao.update(rcl);
} else {
clientDao.add(rcl);
@@ -65,7 +65,6 @@ public class DatabaseStore implements IC
Map<Long, List<Client>> returnMap = new HashMap<Long, List<Client>>();
List<Client> clientList = clientDao.getClientsByPublicSID(publicSID);
for (Client cl : clientList) {
-
if (cl.getServer() == null) {
List<Client> clList = returnMap.get(null);
if (clList == null) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/pom.xml?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/pom.xml Thu Mar 31 11:28:41 2016
@@ -33,6 +33,7 @@
<openjpa.version>2.4.1</openjpa.version>
<asterisk-java.version>1.0.0</asterisk-java.version>
<commons-dbcp.version>2.1.1</commons-dbcp.version>
+ <commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering -->
<commons-pool2.version>2.4.2</commons-pool2.version>
<postgresql.version>9.4.1208.jre7</postgresql.version>
<site.basedir>${project.parent.basedir}</site.basedir>
@@ -78,6 +79,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${commons-pool2.version}</version>
Modified: openmeetings/application/trunk/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/trunk/LICENSE (original)
+++ openmeetings/application/trunk/LICENSE Thu Mar 31 11:28:41 2016
@@ -329,6 +329,7 @@ webapps/openmeetings/WEB-INF/lib/commons
webapps/openmeetings/WEB-INF/lib/commons-collections4-4.1.jar
webapps/openmeetings/WEB-INF/lib/commons-dbcp2-2.1.1.jar
webapps/openmeetings/WEB-INF/lib/commons-lang-2.4.jar
+webapps/openmeetings/WEB-INF/lib/commons-pool-1.6.jar
webapps/openmeetings/WEB-INF/lib/commons-pool2-2.4.2.jar
webapps/openmeetings/WEB-INF/lib/commons-transaction-1.2.jar
webapps/openmeetings/WEB-INF/lib/cxf-core-3.1.5.jar
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java Thu Mar 31 11:28:41 2016
@@ -42,7 +42,7 @@ public class DatabaseStore implements IC
}
public void put(String streamId, Client rcl) {
- if (rcl.getId() > 0) {
+ if (rcl.getId() != null) {
clientDao.update(rcl);
} else {
clientDao.add(rcl);
@@ -65,7 +65,6 @@ public class DatabaseStore implements IC
Map<Long, List<Client>> returnMap = new HashMap<Long, List<Client>>();
List<Client> clientList = clientDao.getClientsByPublicSID(publicSID);
for (Client cl : clientList) {
-
if (cl.getServer() == null) {
List<Client> clList = returnMap.get(null);
if (clList == null) {
Modified: openmeetings/application/trunk/openmeetings-db/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/pom.xml?rev=1737228&r1=1737227&r2=1737228&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-db/pom.xml Thu Mar 31 11:28:41 2016
@@ -33,6 +33,7 @@
<openjpa.version>2.4.1</openjpa.version>
<asterisk-java.version>1.0.0</asterisk-java.version>
<commons-dbcp.version>2.1.1</commons-dbcp.version>
+ <commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering -->
<commons-pool2.version>2.4.2</commons-pool2.version>
<postgresql.version>9.4.1208.jre7</postgresql.version>
<site.basedir>${project.parent.basedir}</site.basedir>
@@ -78,6 +79,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${commons-pool2.version}</version>