From 487b2d1f0d46c7b87c89510585129858d53dc0d3 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 4 Aug 2011 12:42:50 +0200 Subject: [PATCH] IDEA-55105 (CVS integration plugin throws NullPointerException if no roots are configured) --- .../intellij/cvsSupport2/config/CvsRootConfiguration.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java index a86c2a224497..caa5c149e370 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -243,9 +243,8 @@ public class CvsRootConfiguration extends AbstractConfiguration implements CvsEn public CvsRepository createCvsRepository() { CvsConnectionSettings settings = createSettings(); - - return new CvsRepository(settings.getCvsRootAsString(), settings.METHOD.getName(), settings.USER, settings.HOST, settings.REPOSITORY, - settings.PORT, DATE_OR_REVISION_SETTINGS); + return new CvsRepository(settings.getCvsRootAsString(), (settings.METHOD == null) ? "" : settings.METHOD.getName(), settings.USER, + settings.HOST, settings.REPOSITORY, settings.PORT, DATE_OR_REVISION_SETTINGS); }