From olio-commits-return-235-apmail-incubator-olio-commits-archive=incubator.apache.org@incubator.apache.org Thu Sep 24 22:49:52 2009 Return-Path: Delivered-To: apmail-incubator-olio-commits-archive@minotaur.apache.org Received: (qmail 68023 invoked from network); 24 Sep 2009 22:49:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 22:49:52 -0000 Received: (qmail 81858 invoked by uid 500); 24 Sep 2009 22:49:52 -0000 Delivered-To: apmail-incubator-olio-commits-archive@incubator.apache.org Received: (qmail 81841 invoked by uid 500); 24 Sep 2009 22:49:52 -0000 Mailing-List: contact olio-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: olio-dev@incubator.apache.org Delivered-To: mailing list olio-commits@incubator.apache.org Received: (qmail 81831 invoked by uid 99); 24 Sep 2009 22:49:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 22:49:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 22:49:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 94F0323888CC; Thu, 24 Sep 2009 22:49:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818648 - /incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java Date: Thu, 24 Sep 2009 22:49:30 -0000 To: olio-commits@incubator.apache.org From: klichong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924224930.94F0323888CC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: klichong Date: Thu Sep 24 22:49:30 2009 New Revision: 818648 URL: http://svn.apache.org/viewvc?rev=818648&view=rev Log: Fix for Olio-118. Related - see Olio-109. Fix for DatabaseException for SocialEvent's timezone problem Modified: incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java Modified: incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java URL: http://svn.apache.org/viewvc/incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java?rev=818648&r1=818647&r2=818648&view=diff ============================================================================== --- incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java (original) +++ incubator/olio/webapp/java/trunk/ws/apps/webapp/src/java/org/apache/olio/webapp/model/SocialEvent.java Thu Sep 24 22:49:30 2009 @@ -63,7 +63,6 @@ private String imageThumbURL; private String literatureURL; private String telephone; - private String timezone; private Address address; private int totalScore; private int numberOfVotes; @@ -86,7 +85,6 @@ this.imageThumbURL = imageThumbURL; this.literatureURL = literatureURL; this.telephone = telephone; - //this.timezone = timezone; this.eventTimestamp = eventTimestamp; this.disabled = 0; this.createdTimestamp=new Timestamp(new Date().getTime()); @@ -220,10 +218,6 @@ this.telephone=telephone; } - public void setTimezone(String timezone) { - this.timezone=timezone; - } - @ManyToMany(mappedBy = "socialEvents") public List getTags() {