[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/transport Mail.java,1.35.2.5,1.35.2.6

[<kc...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv547/src/hk/hku/cecid/phoenix/message/transport

Modified Files:
      Tag: b0931
	Mail.java 
Log Message:
added flag to indicate a message is encrypted or not

Index: Mail.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport/Mail.java,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.6
diff -C2 -d -r1.35.2.5 -r1.35.2.6
*** Mail.java	17 Jul 2003 08:08:13 -0000	1.35.2.5
--- Mail.java	17 Jul 2003 09:41:59 -0000	1.35.2.6
***************
*** 715,718 ****
--- 715,719 ----
                  final MimeHeaders mimeHeaders = new MimeHeaders();
                  final SOAPMessage soapMessage;
+                 boolean encrypted = false;
                  try {
                      String type = messages[i].getContentType();
***************
*** 732,736 ****
                              smimeKeyStoreAlias == null) {
                              logger.debug("Cannot decrypt, invalid keystore");
!                             throw new SMIMEException("Cannot decrypt, invalid keystore");
                          }
                          else {
--- 733,738 ----
                              smimeKeyStoreAlias == null) {
                              logger.debug("Cannot decrypt, invalid keystore");
!                             throw new SMIMEException(
!                                 "Cannot decrypt, invalid keystore");
                          }
                          else {
***************
*** 744,747 ****
--- 746,750 ----
                              soapMessage = messageFactory.createMessage
                                  (mimeHeaders, msg.getInputStream());
+                             encrypted = true;
                          }
                      }
***************
*** 781,785 ****
                      }
  
!                     ebxmlMessages.add(new EbxmlMessage(soapMessage));
                      messages[i].setFlag(Flags.Flag.DELETED, true);
                  }
--- 784,792 ----
                      }
  
!                     EbxmlMessage ebxmlMessage = new EbxmlMessage(soapMessage);
!                     if (encrypted) {
!                         ebxmlMessage.setSMIMEEncrypted();
!                     }
!                     ebxmlMessages.add(ebxmlMessage);
                      messages[i].setFlag(Flags.Flag.DELETED, true);
                  }