localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix nullpointer again

This commit is contained in:
Hannes Huber 2020-05-27 15:10:12 +02:00
parent e5b28250c2
commit 9406bbc4ac
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
View File

@ -1,5 +1,6 @@
package org.hso.ecommerce.controller;
import org.hso.ecommerce.entities.booking.PaymentMethod;
import org.hso.ecommerce.entities.shop.Address;
import org.hso.ecommerce.entities.user.User;
import org.hso.ecommerce.repos.user.UserRepository;
@ -51,6 +52,7 @@ public class RegisterController {
newUser.email = username;
newUser.isEmployee = false;
newUser.salutation = salutation;
newUser.defaultPayment = PaymentMethod.fromCreditCardNumber("");
newUser.isActive = true;
newUser.created = new java.sql.Timestamp(System.currentTimeMillis());

4
prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
View File

@ -1,7 +1,6 @@
package org.hso.ecommerce.controller;
import org.hso.ecommerce.action.user.UpdateUserSettingsAction;
import org.hso.ecommerce.entities.booking.PaymentMethod;
import org.hso.ecommerce.entities.shop.CustomerOrder;
import org.hso.ecommerce.entities.user.User;
import org.hso.ecommerce.repos.shop.CustomerOrderRepository;
@ -39,9 +38,6 @@ public class UserController {
) {
long userId = (long) session.getAttribute("userId");
User user = userRepository.findById(userId).get();
if(user.defaultPayment == null){
user.defaultPayment = PaymentMethod.fromCreditCardNumber("");
}
model.addAttribute("user", user);
return "user/settings";