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 2017/01/31 17:37:55 UTC
svn commit: r1781130 - in /openmeetings/application:
branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/
trunk/openmeetings-db/src/main/jav...
Author: solomax
Date: Tue Jan 31 17:37:55 2017
New Revision: 1781130
URL: http://svn.apache.org/viewvc?rev=1781130&view=rev
Log:
[OPENMEETINGS-1546] access denied should be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1781130&r1=1781129&r2=1781130&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Tue Jan 31 17:37:55 2017
@@ -58,7 +58,8 @@ public class SOAPLoginDao {
soapLogin.setLandingZone(landingZone);
soapLogin.setAllowRecording(allowRecording);
- soapLogin = em.merge(soapLogin);
+ em.persist(soapLogin);
+ em.flush();
Long soapLoginId = soapLogin.getId();
if (soapLoginId != null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java?rev=1781130&r1=1781129&r2=1781130&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java Tue Jan 31 17:37:55 2017
@@ -141,6 +141,7 @@ public class HashPage extends BaseInited
@Override
protected void onInitialize() {
super.onInitialize();
+ remove(urlParametersReceivingBehavior);
add(new MessageDialog("access-denied", getString("invalid.hash"), getString(errorKey), DialogButtons.OK,
DialogIcon.ERROR) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1781130&r1=1781129&r2=1781130&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Tue Jan 31 17:37:55 2017
@@ -58,7 +58,8 @@ public class SOAPLoginDao {
soapLogin.setLandingZone(landingZone);
soapLogin.setAllowRecording(allowRecording);
- soapLogin = em.merge(soapLogin);
+ em.persist(soapLogin);
+ em.flush();
Long soapLoginId = soapLogin.getId();
if (soapLoginId != null) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java?rev=1781130&r1=1781129&r2=1781130&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java Tue Jan 31 17:37:55 2017
@@ -141,6 +141,7 @@ public class HashPage extends BaseInited
@Override
protected void onInitialize() {
super.onInitialize();
+ remove(urlParametersReceivingBehavior);
add(new MessageDialog("access-denied", getString("invalid.hash"), getString(errorKey), DialogButtons.OK,
DialogIcon.ERROR) {
private static final long serialVersionUID = 1L;