svn commit: r1733794 - in /openmeetings/application: branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java

[solomax]

Author: solomax
Date: Sun Mar  6 08:01:21 2016
New Revision: 1733794

URL: http://svn.apache.org/viewvc?rev=1733794&view=rev
Log:
[OPENMEETINGS-1339] poll results are displayed as expected

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
    
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1733794&r1=1733793&r2=1733794&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
 Sun Mar  6 08:01:21 2016
@@ -72,7 +72,7 @@ public class RoomPollAnswer implements I
        private Date voteDate;
        
        @OneToOne(fetch = FetchType.EAGER)
-       @JoinColumn(name = "room_poll_id")
+       @JoinColumn(name = "poll_id")
        private RoomPoll roomPoll;
        
        public Long getId() {

Modified: 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1733794&r1=1733793&r2=1733794&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
 Sun Mar  6 08:01:21 2016
@@ -72,7 +72,7 @@ public class RoomPollAnswer implements I
        private Date voteDate;
        
        @OneToOne(fetch = FetchType.EAGER)
-       @JoinColumn(name = "room_poll_id")
+       @JoinColumn(name = "poll_id")
        private RoomPoll roomPoll;
        
        public Long getId() {