Commit 21719714 authored by Brian Major's avatar Brian Major
Browse files

Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2

parents 2a089f31 097ee7a6

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/UserRequestReader.java

+2 −2
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ import java.util.Scanner; 
public class UserRequestReader

{

    /**

     * Construct a UserRequest from an XML String source.

     * Construct a UserRequest from an JSON String source.

     *

     * @param json String of the XML.

     * @param json String of the JSON.

     * @return UserRequest UserRequest.

     * @throws IOException

     */