svnno****@sourc*****
svnno****@sourc*****
2007年 10月 20日 (土) 07:26:54 JST
Revision: 643
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=643
Author: shinsuke
Date: 2007-10-20 07:26:53 +0900 (Sat, 20 Oct 2007)
Log Message:
-----------
check duplicated portal id.
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2007-10-19 07:04:09 UTC (rev 642)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2007-10-19 22:26:53 UTC (rev 643)
@@ -98,8 +98,11 @@
CustomerCB cb = new CustomerCB();
// cb.setupSelect_CustomerInfoAsOne();
cb.query().setPortalId_Equal(portalId);
- Customer customers = customerBhv.selectEntity(cb);
- return customers;
+ List<Customer> customers = customerBhv.selectList(cb);
+ if(customers.isEmpty()){
+ return null;
+ }
+ return customers.get(0);
}
public void deleteCustomer(BigDecimal customerId) {
@@ -172,6 +175,7 @@
}
public void addCustomer(Customer customer, AddressBook addressBook) {
+ //TODO check portalid
getCustomerBhv().insert(customer);
addressBook.setCustomerId(customer.getCustomerId());
getAddressBookBhv().insert(addressBook);
@@ -247,6 +251,11 @@
}
String userName = userInfo.get(PompeiConstants.USER_NAME);
+ Customer c=getCustomerByPortalId(userName);
+ if(c!=null){
+ deleteCustomer(c.getCustomerId());
+ }
+
try {
SystemUtil.getPortalAdministration().registerUser(
userName,