[Amavisadmin-svn] SF.net SVN: amavisadmin: [43] amavisadmin/trunk/src/java/de/sreindl/ amavisadmin
Status: Beta
Brought to you by:
streindl
From: <str...@us...> - 2007-01-24 17:49:48
|
Revision: 43 http://amavisadmin.svn.sourceforge.net/amavisadmin/?rev=43&view=rev Author: streindl Date: 2007-01-24 09:49:44 -0800 (Wed, 24 Jan 2007) Log Message: ----------- fix for #1643722 Modified Paths: -------------- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ShowSingleMail.java amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/AbstractQuarantine.java amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.hbm.xml amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.java Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ShowSingleMail.java =================================================================== --- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ShowSingleMail.java 2007-01-22 22:59:12 UTC (rev 42) +++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ShowSingleMail.java 2007-01-24 17:49:44 UTC (rev 43) @@ -446,11 +446,16 @@ if (message.getMsgs().getQuarantines() == null) { return "unset"; } - Iterator i = message.getMsgs().getQuarantines().iterator(); + Iterator iQ = message.getMsgs().getQuarantines().iterator(); StringBuilder msg = new StringBuilder(message.getMsgs().getSize().intValue()); - while (i.hasNext()) { - Quarantine q = (Quarantine)i.next(); - msg.append(q.getMailText()); + while (iQ.hasNext()) { + Quarantine q = (Quarantine)iQ.next(); + byte[] mailText = q.getMailText(); + char[] buffer = new char[mailText.length]; + for (int i= 0; i < mailText.length; i++) { + buffer[i] = (char)mailText[i]; + } + msg.append(buffer); } String buffer = msg.substring(0, Math.min(8192, msg.length())); buffer = buffer.replaceAll("&", "&"); Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/AbstractQuarantine.java =================================================================== --- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/AbstractQuarantine.java 2007-01-22 22:59:12 UTC (rev 42) +++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/AbstractQuarantine.java 2007-01-24 17:49:44 UTC (rev 43) @@ -28,7 +28,7 @@ private QuarantineId id; private Message msgs; - private String mailText; + private byte[] mailText; private Integer version; @@ -40,7 +40,7 @@ /** full constructor */ - public AbstractQuarantine(QuarantineId id, Message msgs, String mailText) { + public AbstractQuarantine(QuarantineId id, Message msgs, byte[] mailText) { this.id = id; this.msgs = msgs; this.mailText = mailText; @@ -65,11 +65,11 @@ this.msgs = msgs; } - public String getMailText() { + public byte[] getMailText() { return this.mailText; } - public void setMailText(String mailText) { + public void setMailText(byte[] mailText) { this.mailText = mailText; } @@ -89,4 +89,4 @@ -} \ No newline at end of file +} Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.hbm.xml =================================================================== --- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.hbm.xml 2007-01-22 22:59:12 UTC (rev 42) +++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.hbm.xml 2007-01-24 17:49:44 UTC (rev 43) @@ -32,7 +32,7 @@ <many-to-one name="msgs" class="de.sreindl.amavisadmin.db.Message" update="false" insert="false" fetch="select"> <column name="mail_id" length="12" not-null="true" /> </many-to-one> - <property name="mailText" type="java.lang.String"> + <property name="mailText" type="binary"> <column name="mail_text" not-null="true" /> </property> </class> Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.java =================================================================== --- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.java 2007-01-22 22:59:12 UTC (rev 42) +++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/db/Quarantine.java 2007-01-24 17:49:44 UTC (rev 43) @@ -37,7 +37,7 @@ /** full constructor */ - public Quarantine(QuarantineId id, Message msgs, String mailText) { + public Quarantine(QuarantineId id, Message msgs, byte[] mailText) { super(id, msgs, mailText); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |