dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nullpointerexception

Browse Source
This commit is contained in:
Volodymyr Babak 2017-06-29 12:22:37 +03:00
parent 6e2bbe0241
commit 52d53c952e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View File

@ -62,7 +62,12 @@ public class DeviceController extends BaseController {
try { try {
device.setTenantId(getCurrentUser().getTenantId()); device.setTenantId(getCurrentUser().getTenantId());
Device savedDevice = checkNotNull(deviceService.saveDevice(device)); Device savedDevice = checkNotNull(deviceService.saveDevice(device));
actorService.onDeviceNameOrTypeUpdate(device.getTenantId(), device.getId(), device.getName(), device.getType()); actorService
.onDeviceNameOrTypeUpdate(
savedDevice.getTenantId(),
savedDevice.getId(),
savedDevice.getName(),
savedDevice.getType());
return savedDevice; return savedDevice;
} catch (Exception e) { } catch (Exception e) {
throw handleException(e); throw handleException(e);
@ -176,7 +181,7 @@ public class DeviceController extends BaseController {
try { try {
TenantId tenantId = getCurrentUser().getTenantId(); TenantId tenantId = getCurrentUser().getTenantId();
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset); TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
if (type != null && type.trim().length()>0) { if (type != null && type.trim().length() > 0) {
return checkNotNull(deviceService.findDevicesByTenantIdAndType(tenantId, type, pageLink)); return checkNotNull(deviceService.findDevicesByTenantIdAndType(tenantId, type, pageLink));
} else { } else {
return checkNotNull(deviceService.findDevicesByTenantId(tenantId, pageLink)); return checkNotNull(deviceService.findDevicesByTenantId(tenantId, pageLink));
@ -215,7 +220,7 @@ public class DeviceController extends BaseController {
CustomerId customerId = new CustomerId(toUUID(strCustomerId)); CustomerId customerId = new CustomerId(toUUID(strCustomerId));
checkCustomerId(customerId); checkCustomerId(customerId);
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset); TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
if (type != null && type.trim().length()>0) { if (type != null && type.trim().length() > 0) {
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerIdAndType(tenantId, customerId, type, pageLink)); return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerIdAndType(tenantId, customerId, type, pageLink));
} else { } else {
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink)); return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink));

3
dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
View File

@ -24,8 +24,7 @@ import java.util.Arrays;
@RunWith(ClasspathSuite.class) @RunWith(ClasspathSuite.class)
@ClassnameFilters({ @ClassnameFilters({
// "org.thingsboard.server.dao.sql.alarm.", "org.thingsboard.server.dao.sql.*Test"
"org.thingsboard.server.dao.sql.*Test",
}) })
public class JpaDaoTestSuite { public class JpaDaoTestSuite {